smaller fixes ide

ide/build.gradle

@@ -24,6 +24,9 @@ dependencies {
     implementation group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.5'
     implementation 'org.kordamp.ikonli:ikonli-fontawesome5-pack:12.0.0'
     implementation 'org.kordamp.ikonli:ikonli-javafx:12.0.0'
+
+    implementation 'org.jfxtras:jmetro:11.6.15'
+    implementation 'com.pixelduke:fxribbon:1.2.2'
 }
 
 repositories {

ide/src/main/kotlin/edu/kit/iti/formal/automation/fx/editor.kt

@@ -41,7 +41,7 @@ object Editors {
     fun getLanguageForFilename(file: File) = getEditorForSuffix(file.extension)
     fun getEditorForSuffix(suffix: String): Language? =
         when (suffix) {
-            ".tt", ".gtt" -> TTLanguage
+            "tt", "gtt" -> TTLanguage
             "st", "iec" -> StLanguage
             "smv" -> SmvLanguage
             "smt" -> SmtLanguage
@@ -51,7 +51,7 @@ object Editors {
 
 
 open class Editor : View() {
-    override val root = CodeArea("")
+    final override val root = CodeArea("")
     val dirtyProperty = SimpleBooleanProperty(this, "dirty", false)
     val dirty by dirtyProperty
     val filenameProperty = SimpleObjectProperty<File>(this, "filename", null)
@@ -153,7 +153,7 @@ open class Editor : View() {
             val tok = lexer.nextToken()
             if (tok.type == -1) break
             val typ = language.getStyleClass(tok.type)// lexer.vocabulary.getSymbolicName(tok.type)
-            spansBuilder.add(Collections.singleton(typ), tok.text.length);
+            spansBuilder.add(Collections.singleton(typ), tok.text.length)
         } while (tok.type != -1)
         return spansBuilder.create()
     }
@@ -199,7 +199,7 @@ object StLanguage : Language() {
 
     override fun lexerFactory(input: CharStream): Lexer = IEC61131Lexer(input)
     override fun parseFile(fromString: CharStream): List<Problem> {
-        val (pous, errors) = IEC61131Facade.fileResolve(fromString, true)
+        val (_, errors) = IEC61131Facade.fileResolve(fromString, true)
         return errors
     }
 
@@ -224,7 +224,7 @@ object StLanguage : Language() {
             END_CONFIGURATION,
             END_FUNCTION_BLOCK,
             FUNCTION_BLOCK,
-            IEC61131Lexer.FUNCTION,
+            FUNCTION,
             END_FUNCTION,
             END_INTERFACE,
             END_METHOD,
@@ -308,7 +308,7 @@ object TTLanguage : Language() {
     override val name: String = "TestTables"
 
     override fun lexerFactory(input: CharStream): Lexer = TestTableLanguageLexer(input)
-    override fun parseFile(fromString: CharStream): List<Problem>? {
+    override fun parseFile(fromString: CharStream): List<Problem> {
         val p = GetetaFacade.createParser(fromString)
         p.file()
         return p.errorReporter.errors.map {
@@ -378,8 +378,4 @@ object SmtLanguage : Language() {
     override val name: String = "SMT"
     override fun lexerFactory(input: CharStream): Lexer = SmtLibv2Lexer(input)
     override fun parseFile(fromString: CharStream): List<Problem>? = null
-}
-
-enum class StyleNames {
-
 }

ide/src/main/kotlin/edu/kit/iti/formal/automation/fx/fx.kt

@@ -14,6 +14,9 @@ import javafx.scene.input.KeyCombination
 import javafx.scene.paint.Color
 import javafx.scene.text.FontWeight
 import javafx.stage.FileChooser
+import javafx.stage.Stage
+import jfxtras.styles.jmetro.JMetro
+import jfxtras.styles.jmetro.Style
 import org.kordamp.ikonli.javafx.FontIcon
 import org.kordamp.ikonli.javafx.IkonResolver
 import tornadofx.*
@@ -116,11 +119,16 @@ class IdeStyle : Stylesheet() {
 
 
 class IdeFx : App(IdeView::class, IdeStyle::class) {
-    //override val configBasePath = Paths.get("/etc/myapp/conf")
-
     init {
-        reloadStylesheetsOnFocus()
-        dumpStylesheets()
+        //reloadStylesheetsOnFocus()
+        //dumpStylesheets()
+
+    }
+
+    override fun start(stage: Stage) {
+        super.start(stage)
+        val jMetro = JMetro(Style.LIGHT)
+        jMetro.scene = stage.scene
     }
 }
 

ide/src/main/kotlin/edu/kit/iti/formal/automation/fx/navigator.kt

@@ -5,20 +5,28 @@ import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import javafx.event.ActionEvent
 import javafx.event.EventHandler
+import javafx.scene.Node
 import javafx.scene.control.*
 import javafx.scene.control.cell.TextFieldTreeCell
 import javafx.scene.input.KeyCombination
+import javafx.scene.paint.Color.*
 import javafx.util.StringConverter
+import org.kordamp.ikonli.Ikon
+import org.kordamp.ikonli.Ikonli
+import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid
 import org.kordamp.ikonli.javafx.FontIcon
 import org.kordamp.ikonli.javafx.IkonResolver
 import tornadofx.View
 import tornadofx.contextmenu
 import tornadofx.separator
+import java.awt.Color
 import java.awt.Desktop
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
+import kotlin.io.path.extension
+import kotlin.io.path.isDirectory
 import kotlin.io.path.name
 import tornadofx.item as titem
 
@@ -42,32 +50,36 @@ class FileNavigator(main: IdeView) : View("Navigator") {
 
 
     val contextMenu: ContextMenu = contextmenu {
-        item("tree-open-file", "ENTER", null) {
+        item("Open file", "ENTER", null) {
             markFolderUnderMouse(it)
             treeFile.selectionModel.selectedItem?.let {
                 main.open(it.value.toFile())
             }
         }
-        item("refresh") {}
-        item("expand-tree") {
-            markFolderUnderMouse(it)
-        }
-        separator()
-        item("go-up") {
+
+        item("Open in explorer") {
             markFolderUnderMouse(it)
-            (treeFile.root.value as? Path)?.let { file ->
-                treeFile.root = SimpleFileTreeItem(file.parent.toAbsolutePath())
-                treeFile.root.isExpanded = true
+            (treeFile.selectionModel.selectedItem)?.let { file ->
+                try {
+                    Desktop.getDesktop()?.browseFileDirectory(file.value.toFile())
+                } catch (e: UnsupportedOperationException) {
+                    ProcessBuilder("explorer", "/select,${file.value}").start()
+                }
             }
         }
-        item("go-into") {
+        item("System open") {
             markFolderUnderMouse(it)
             (treeFile.selectionModel.selectedItem)?.let { file ->
-                treeFile.root = SimpleFileTreeItem(file.value.toAbsolutePath())
-                treeFile.root.isExpanded = true
+                try {
+                    Desktop.getDesktop()?.open(file.value.toFile())
+                } catch (e: UnsupportedOperationException) {
+                    ProcessBuilder("explorer", "/select,${file.value}").start()
+                }
             }
         }
+
         separator()
+
         item("tree-new-file") {
             markFolderUnderMouse(it)
             treeFile.selectionModel.selectedItem?.let { item ->
@@ -110,29 +122,38 @@ class FileNavigator(main: IdeView) : View("Navigator") {
                 }
             }
         }
-        item("tree-rename-file") { }
-        item("tree-delete-file") {}
         separator()
-        item("open-in-explorer") {
+
+
+        item("Refresh") {}
+
+        item("Expand Tree") {
             markFolderUnderMouse(it)
-            (treeFile.selectionModel.selectedItem)?.let { file ->
-                try {
-                    Desktop.getDesktop()?.browseFileDirectory(file.value.toFile())
-                } catch (e: UnsupportedOperationException) {
-                    ProcessBuilder("explorer", "/select,${file.value}").start()
-                }
+        }
+
+        separator()
+
+        item("Go up") {
+            markFolderUnderMouse(it)
+            treeFile.root.value?.let { file ->
+                treeFile.root = SimpleFileTreeItem(file.parent.toAbsolutePath())
+                treeFile.root.isExpanded = true
             }
         }
-        item("xdg-open") {
+        item("Go into") {
             markFolderUnderMouse(it)
             (treeFile.selectionModel.selectedItem)?.let { file ->
-                try {
-                    Desktop.getDesktop()?.open(file.value.toFile())
-                } catch (e: UnsupportedOperationException) {
-                    ProcessBuilder("explorer", "/select,${file.value}").start()
-                }
+                treeFile.root = SimpleFileTreeItem(file.value.toAbsolutePath())
+                treeFile.root.isExpanded = true
             }
         }
+
+        separator()
+
+        item("Rename file") { }
+        item("Delete file") {}
+
+        separator()
     }
 
     fun refresh(): Unit {
@@ -175,6 +196,10 @@ class SimpleFileTreeItem(f: Path) : TreeItem<Path>(f) {
     private var isFirstTimeLeaf = true
     private var isLeaf = false
 
+    init {
+        graphic = NavigationIconFinder.find(f)
+    }
+
     override fun getChildren(): ObservableList<TreeItem<Path>> {
         if (isFirstTimeChildren) {
             isFirstTimeChildren = false
@@ -204,3 +229,27 @@ class SimpleFileTreeItem(f: Path) : TreeItem<Path>(f) {
         return FXCollections.emptyObservableList()
     }
 }
+
+object NavigationIconFinder {
+    private val resolver = IkonResolver.getInstance()
+    private val DIRECTORY = FontAwesomeSolid.FOLDER
+    private val FILE = FontAwesomeSolid.FILE
+    private val FILE_CODE = FontAwesomeSolid.FILE_CODE
+
+    private fun get(ref: String): FontIcon? {
+        return resolver.resolve(ref).resolve(ref)?.let { FontIcon(it) }!!
+    }
+
+    fun find(p: Path): Node? {
+        if (p.isDirectory()) {
+            return FontIcon(DIRECTORY)
+        }
+
+        return when (p.extension) {
+            "gtt", "rtt", "st" -> FontIcon(FILE_CODE)
+            else -> FontIcon(FILE).also {
+                it.iconColor = LIGHTGREY
+            }
+        }
+    }
+}