fixes #16

fixes #15

Author: me6262

app/src/main/java/frc238/App.kt

@@ -3,14 +3,10 @@ package frc238
 import ch.bailu.gtk.adw.AboutWindow
 import ch.bailu.gtk.adw.Application
 import ch.bailu.gtk.adw.ApplicationWindow
-import ch.bailu.gtk.adw.ColorScheme
 import ch.bailu.gtk.adw.HeaderBar
-import ch.bailu.gtk.adw.StyleManager
 import ch.bailu.gtk.adw.ToastPriority
 import ch.bailu.gtk.adw.WindowTitle
 import ch.bailu.gtk.gio.ApplicationFlags
-import ch.bailu.gtk.gio.File
-import ch.bailu.gtk.gio.Gio
 import ch.bailu.gtk.gio.Menu
 import ch.bailu.gtk.gio.MenuItem
 import ch.bailu.gtk.gio.SimpleAction
@@ -22,7 +18,6 @@ import ch.bailu.gtk.gtk.Orientation
 import ch.bailu.gtk.gtk.StyleContext
 import ch.bailu.gtk.type.Str
 import ch.bailu.gtk.type.Strs
-import ch.bailu.gtk.type.exception.AllocationError
 import frc238.background.RobotProject
 import frc238.plugins.PluginManager
 import frc238.widgets.AutoPicker
@@ -31,114 +26,44 @@ import frc238.widgets.loadFolder
 import frc238.widgets.makeAndRunPopup
 import java.io.FileNotFoundException
 import java.nio.file.Paths
+import kotlin.system.exitProcess
 
 object App {
     // FIXME avoid global variables
-    lateinit var picker: AutoPicker
     lateinit var app: Application
+    lateinit var picker: AutoPicker
     lateinit var window: ApplicationWindow
     lateinit var project: RobotProject
     lateinit var header: HeaderBar
     lateinit var title: WindowTitle
     lateinit var settings: Settings
     lateinit var plugins: PluginManager
-    private fun init() {
-        settings = Settings()
-        plugins = PluginManager()
-    }
 
     @JvmStatic
     fun main(args: Array<String>) {
         // Adw.init() // This call should not be necessary if you use adw.Application instead of gtk.Application
-        app = Application("org.frc238.autoBuilder", ApplicationFlags.FLAGS_NONE)
+        val theApp = Application("org.frc238.autoBuilder", ApplicationFlags.FLAGS_NONE)
 
         /*
         FIXME This works only with compiled resources
         Compile with `glib-compile-resources` application that is part of the gtk distribution
         See Adwaita example in java-gtk
         there is also a helper function to load compiled resource files: GResource.loadAndRegister("path/to/compiled.gresources")
         */
-        val gresource = File.newForPath(Str("icons/resources.gresource.xml"))
-        try {
-            Gio.resourceLoad(gresource.path)
-        } catch (e: AllocationError) {
-            throw RuntimeException(e)
-        }
+//        val gresource = File.newForPath(Str("icons/resources.gresource.xml"))
+//        try {
+//            Gio.resourceLoad(gresource.path)
+//        } catch (e: AllocationError) {
+//            throw RuntimeException(e)
+//        }
 
         // This could cause crashes
-        StyleManager.getDefault().colorScheme = ColorScheme.FORCE_DARK
-
-        app.onActivate {
-
-            init() // Load widgets here (after app.run())
-
-            header = HeaderBar()
-            header.addCssClass("flat")
-
-            project = RobotProject()
-            picker = AutoPicker()
-            title = WindowTitle("Autonomous Builder", "")
-            header.titleWidget = title
-            val cssProvider = CssProvider()
-            val toggleCommandFlap = Button()
-            toggleCommandFlap.setIconName("sidebar-show-right-symbolic")
-            toggleCommandFlap.onClicked { picker.commandSidebar.onToggleClicked() }
-            header.packEnd(toggleCommandFlap)
-
-            val menubutton = MenuButton()
-            menubutton.setIconName("open-menu-symbolic")
-
-            val menu = Menu()
-            val about = MenuItem("About", "app.about")
-            menu.appendItem(about)
-            val aboutAction = SimpleAction("about", null)
-            app.asActionMap().addAction(aboutAction.asAction())
-            aboutAction.onActivate { showAboutWindow() }
-            val properties = MenuItem("Properties", "app.properties")
-            val propertiesAction = SimpleAction("properties", null)
-            menu.appendItem(properties)
-            propertiesAction.onActivate { settings.openPrefsWindow() }
-            app.asActionMap().addAction(propertiesAction.asAction())
-            menubutton.menuModel = menu
-            header.packEnd(menubutton)
-            val load = Button()
-            load.setLabel("Load")
-            load.onClicked { loadFolder() }
-            load.setIconName("folder-open-symbolic")
-            header.packEnd(load)
-            val save = Button()
-            save.onClicked { saveAmodeFile() }
-            save.setIconName("media-floppy-symbolic")
-            header.packEnd(save)
-            val toggleFlap = Button()
-            toggleFlap.setIconName("sidebar-show-symbolic")
-            toggleFlap.onClicked { picker.onToggleClicked() }
-            header.packStart(toggleFlap)
-            val addNewMode = Button()
-            addNewMode.setIconName("list-add-symbolic")
-            addNewMode.onClicked { picker.stack.addAmodeToList() }
-            header.packStart(addNewMode)
-            val removeMode = Button.newFromIconNameButton("user-trash-symbolic")
-            removeMode.onClicked { picker.stack.removeAmode() }
-            header.packStart(removeMode)
-            val rename = Button.newFromIconNameButton("document-edit-symbolic")
-            rename.onClicked { picker.stack.renameMode() }
-            header.packStart(rename)
-            window = ApplicationWindow(app)
-            window.direction = Orientation.VERTICAL
-            cssProvider.loadFromPath(Paths.get("").toAbsolutePath().toString() + "/gtk.css")
-            StyleContext.addProviderForDisplay(window.display, cssProvider.asStyleProvider(), ToastPriority.HIGH)
-            //            window.addCssClass("accent");
-            val vbox = Box(Orientation.VERTICAL, 0)
-            val hbox = Box(Orientation.HORIZONTAL, 0)
-            hbox.append(picker.flap)
-            vbox.append(header)
-            vbox.append(hbox)
-            window.setDefaultSize(900, 800)
-            window.content = vbox
-            window.present()
-        }
-        app.run(args.size, Strs(args))
+//        StyleManager.getDefault().colorScheme = ColorScheme.FORCE_DARK
+
+        theApp.onActivate { buildUI(theApp) }
+        theApp.run(args.size, Strs(args))
+        theApp.onShutdown { exitProcess(0) }
+        app = theApp
     }
 
     private fun showAboutWindow() {
@@ -150,6 +75,79 @@ object App {
         aboutMenu.show()
     }
 
+    private fun buildUI(app: Application) {
+
+        println("woah")
+
+        settings = Settings()
+        plugins = PluginManager()
+        header = HeaderBar()
+        header.addCssClass("flat")
+
+        project = RobotProject()
+        picker = AutoPicker()
+        title = WindowTitle("Autonomous Builder", "")
+        header.titleWidget = title
+        val cssProvider = CssProvider()
+        val toggleCommandFlap = Button()
+        toggleCommandFlap.setIconName("sidebar-show-right-symbolic")
+        toggleCommandFlap.onClicked { picker.commandSidebar.onToggleClicked() }
+        header.packEnd(toggleCommandFlap)
+
+        val menubutton = MenuButton()
+        menubutton.setIconName("open-menu-symbolic")
+
+        val menu = Menu()
+        val about = MenuItem("About", "app.about")
+        menu.appendItem(about)
+        val aboutAction = SimpleAction("about", null)
+        app.asActionMap().addAction(aboutAction.asAction())
+        aboutAction.onActivate { showAboutWindow() }
+        val properties = MenuItem("Properties", "app.properties")
+        val propertiesAction = SimpleAction("properties", null)
+        menu.appendItem(properties)
+        propertiesAction.onActivate { settings.openPrefsWindow() }
+        app.asActionMap().addAction(propertiesAction.asAction())
+        menubutton.menuModel = menu
+        header.packEnd(menubutton)
+        val load = Button()
+        load.setLabel("Load")
+        load.onClicked { loadFolder() }
+        load.setIconName("folder-open-symbolic")
+        header.packEnd(load)
+        val save = Button()
+        save.onClicked { saveAmodeFile() }
+        save.setIconName("media-floppy-symbolic")
+        header.packEnd(save)
+        val toggleFlap = Button()
+        toggleFlap.setIconName("sidebar-show-symbolic")
+        toggleFlap.onClicked { picker.onToggleClicked() }
+        header.packStart(toggleFlap)
+        val addNewMode = Button()
+        addNewMode.setIconName("list-add-symbolic")
+        addNewMode.onClicked { picker.stack.addAmodeToList() }
+        header.packStart(addNewMode)
+        val removeMode = Button.newFromIconNameButton("user-trash-symbolic")
+        removeMode.onClicked { picker.stack.removeAmode() }
+        header.packStart(removeMode)
+        val rename = Button.newFromIconNameButton("document-edit-symbolic")
+        rename.onClicked { picker.stack.renameMode() }
+        header.packStart(rename)
+        window = ApplicationWindow(app)
+        window.direction = Orientation.VERTICAL
+        cssProvider.loadFromPath(Paths.get("").toAbsolutePath().toString() + "/gtk.css")
+        StyleContext.addProviderForDisplay(window.display, cssProvider.asStyleProvider(), ToastPriority.HIGH)
+        //            window.addCssClass("accent");
+        val vbox = Box(Orientation.VERTICAL, 0)
+        val hbox = Box(Orientation.HORIZONTAL, 0)
+        hbox.append(picker.flap)
+        vbox.append(header)
+        vbox.append(hbox)
+        window.setDefaultSize(900, 800)
+        window.content = vbox
+        window.present()
+    }
+
     @JvmStatic
     fun initAutoList() {
         val modes = project.autoModes!!.autonomousModes

app/src/main/java/frc238/background/RobotProject.kt

@@ -143,6 +143,7 @@ class RobotProject(var rootDirectory: String) {
             e.printStackTrace()
             makeAndRunPopup("there was a problem saving to the file", "JsonProcessingException")
         }
+
     }
 
     private fun reloadWPILibClassLoader() {

app/src/main/java/frc238/widgets/AmodeEditorWidget.kt

@@ -23,7 +23,7 @@ class AmodeEditorWidget(commandList: Amode) : ScrolledWindow() {
     private var focusedCommandName: String? = null
     private var amodeCommands: TypedListBox<AutoCommandRow> = TypedListBox<AutoCommandRow>()
 
-    val modeName: String
+    var modeName: String
     private lateinit var mode: Amode
     private var target: DropTarget
 
@@ -45,17 +45,18 @@ class AmodeEditorWidget(commandList: Amode) : ScrolledWindow() {
             println("updated mode")
             println(amodeCommands.size())
             for (i in amodeCommands) {
-                println("stuff")
                 commands += i.updatedCommandList!!
-                println(i.updatedCommandList)
+                println(" - ${i.updatedCommandList?.name}")
 
             }
+            mode.name = modeName
             mode.commands = commands
             return mode
 
         }
 
     private fun setAuto(commandList: Amode) {
+        println(commandList.name)
         focusOnClick = true
         mode = commandList
         amodeCommands.onMoveFocus {

app/src/main/java/frc238/widgets/AmodeStack.kt

@@ -22,6 +22,8 @@ class AmodeStack : Stack() {
     private var editorWidgetSupplier: MutableMap<String, AmodeEditorWidget> = TreeMap()
     private var up: Button
     private var down: Button
+    //counter used to correctly number autos labelled as "New Auto (n)" with n being the number called that
+    private var unnamedCount = 0
 
     init {
         val action = SimpleAction("move-up", null)
@@ -76,16 +78,22 @@ class AmodeStack : Stack() {
         entry.onActivate {
             editorWidgetSupplier.run {
 
-                getPage(visibleChild).title = entry.asEditable().text.also { getPage(visibleChild).name = it }
-                put(entry.asEditable().text.toString(), remove(visibleChild.name.toString())!!.also { it.name = visibleChildName })
-                App.title.subtitle = entry.asEditable().text
+                val oldName = getPage(visibleChild).name.toString()
+                val newName = entry.asEditable().text
+                getPage(visibleChild).title = newName
+                getPage(visibleChild).name = newName
+                val oldMode = remove(oldName)
+                oldMode!!.modeName = newName.toString()
+                put(newName.toString(), oldMode)
+                App.title.subtitle = newName
+                println("new name: $newName")
+                println("old name: $oldName")
                 namePop.hide()
             }
         }
         entry.asEditable().text = visibleChildName
         namePop.popdown()
         namePop.show()
-        println("woah")
     }
     fun removeAmode() {
         editorWidgetSupplier.remove(visibleChildName.toString())
@@ -97,8 +105,8 @@ class AmodeStack : Stack() {
     }
 
     fun addCommandToVisibleChild(info: CommandInfo?) {
-        println(visibleChild.name.toString())
-        editorWidgetSupplier[visibleChild.name.toString()]!!.addCommand(info!!)
+        println(getPage(visibleChild).title.toString())
+        editorWidgetSupplier[getPage(visibleChild).title.toString()]!!.addCommand(info!!)
     }
 
     fun addTitled(widget: AmodeEditorWidget?, name: String) {
@@ -114,7 +122,7 @@ class AmodeStack : Stack() {
     }
 
     fun moveFocusedCommandUp() {
-        editorWidgetSupplier[visibleChild.name.toString()]!!.moveRowUp()
+        editorWidgetSupplier[getPage(visibleChild).title.toString()]!!.moveRowUp()
         println("WOAH")
     }
 }

app/src/main/java/frc238/widgets/AutoCommandRow.kt

@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getTrailingCommaByClosingElement
  * @see ExpanderRow
  *
  */
-class AutoCommandRow : ExpanderRow {
+class AutoCommandRow() : ExpanderRow() {
     private var command: AmodeCommand? = null
     private val parametersMap = HashMap<String, Supplier<Str?>>()
     private lateinit var info: CommandInfo
@@ -35,8 +35,6 @@ class AutoCommandRow : ExpanderRow {
         Parallel, Race, Deadline_Leader, Deadline_Follower, None
     }
 
-    constructor(): super()
-
 
     init {
         focusable = true
@@ -61,6 +59,7 @@ class AutoCommandRow : ExpanderRow {
         this.command = command
         setName(command.name)
         setTitle(command.name)
+        println(command.name)
         val commands = App.project.commands
         for (commandInfo in commands) {
             if (commandInfo.name == command.name) {
@@ -183,7 +182,7 @@ class AutoCommandRow : ExpanderRow {
      */
     val updatedCommandList: AmodeCommand?
         get() {
-            println(parametersMap)
+//            println(parametersMap)
             val parameters = ArrayList<String>()
             if (info.parameters.size >= 1) {
                 for (i in info.parameters.indices) {
@@ -193,11 +192,13 @@ class AutoCommandRow : ExpanderRow {
                         parameters.add("")
                     }
                 }
-                command!!.parallelType = parametersMap["ParallelType"]!!.get().toString()
             }
+            command!!.parallelType = parametersMap["ParallelType"]!!.get().toString()
             command!!.setParameters(parameters)
             println("Set " + command!!.name)
-            println(command!!.parameters)
+            println("params: " + command!!.parameters)
+            println("ParallelType: " + command!!.parallelType)
+            println("-------------------")
             return command
         }