Refactor: Finished the move to modules

app/src/main/scala/tripaint/control/Actions.scala → app/src/main/scala/tripaint/Actions.scala

@@ -1,14 +1,11 @@
-package tripaint.control
+package tripaint
 
-import tripaint.{Color, ImageSaver}
-import tripaint.TriPaintModel
 import tripaint.coords.{GridCoords, StorageCoords}
 import tripaint.effects.Effect
-import tripaint.grid.{GridCell, ImageChange, ImageGrid, ImageGridChange, ImageSaveCollisionHandler}
+import tripaint.grid.*
 import tripaint.image.{ImagePool, ImageStorage, RegularImage}
 import tripaint.image.ImagePool.{SaveInfo, SaveLocation}
 import tripaint.image.format.StorageFormat
-import tripaint.infrastructure.FileSystem
 import tripaint.util.CachedLoader
 import tripaint.view.{FileOpenSettings, FileSaveSettings}
 

app/src/main/scala/tripaint/infrastructure/FileSystem.scala → app/src/main/scala/tripaint/FileSystem.scala

@@ -1,4 +1,4 @@
-package tripaint.infrastructure
+package tripaint
 
 import tripaint.image.RegularImage
 import tripaint.util.{EventDispatcher, Tracker}

app/src/main/scala/tripaint/ImageSaver.scala

@@ -3,7 +3,6 @@ package tripaint
 import tripaint.grid.ImageGrid
 import tripaint.image.{ImageStorage, RegularImage}
 import tripaint.image.ImagePool.{SaveInfo, SaveLocation}
-import tripaint.infrastructure.FileSystem
 
 object ImageSaver {
   def saveImage(

app/src/main/scala/tripaint/view/gui/MainStage.scala → app/src/main/scala/tripaint/MainStage.scala

@@ -1,12 +1,12 @@
-package tripaint.view.gui
+package tripaint
 
-import tripaint.{Color, TriPaintModel}
 import tripaint.ScalaFxExt.{*, given}
 import tripaint.effects.{BlurEffect, MotionBlurEffect, RandomNoiseEffect}
 import tripaint.grid.GridCell
 import tripaint.image.{ImagePool, ImageStorage}
 import tripaint.image.format.{RecursiveStorageFormat, SimpleStorageFormat}
 import tripaint.view.*
+import tripaint.view.gui.*
 import tripaint.view.image.ImageGridPane
 
 import scalafx.application.JFXApp3.PrimaryStage

app/src/main/scala/tripaint/TriPaint.scala

@@ -1,9 +1,5 @@
 package tripaint
 
-import tripaint.TriPaintModel
-import tripaint.control.TriPaintController
-import tripaint.view.gui.MainStage
-
 import scalafx.application.{JFXApp3, Platform}
 import scalafx.application.JFXApp3.PrimaryStage
 

app/src/main/scala/tripaint/control/TriPaintController.scala → app/src/main/scala/tripaint/TriPaintController.scala

@@ -1,16 +1,9 @@
-package tripaint.control
+package tripaint
 
-import tripaint.TriPaintModel
 import tripaint.coords.GridCoords
-import tripaint.effects.{
-  BlurEffect,
-  CellEffect,
-  MotionBlurEffect,
-  RandomNoiseEffect,
-  ScrambleEffect
-}
+import tripaint.effects.*
 import tripaint.grid.GridCell
-import tripaint.view.{TriPaintView, TriPaintViewFactory, TriPaintViewListener}
+import tripaint.view.{TriPaintView, TriPaintViewListener}
 import tripaint.view.gui.UIAction
 
 class TriPaintController(val model: TriPaintModel, viewFactory: TriPaintViewFactory)

app/src/main/scala/tripaint/TriPaintModel.scala

@@ -2,7 +2,6 @@ package tripaint
 
 import tripaint.grid.ImageGrid
 import tripaint.image.ImagePool
-import tripaint.infrastructure.FileSystem
 
 class TriPaintModel(val fileSystem: FileSystem, initialImageSize: Int) {
   val imagePool: ImagePool = new ImagePool()

app/src/main/scala/tripaint/view/TriPaintViewFactory.scala → app/src/main/scala/tripaint/TriPaintViewFactory.scala

@@ -1,6 +1,6 @@
-package tripaint.view
+package tripaint
 
-import tripaint.TriPaintModel
+import tripaint.view.{TriPaintView, TriPaintViewListener}
 
 trait TriPaintViewFactory {
   def createView(controls: TriPaintViewListener, model: TriPaintModel): TriPaintView

app/src/test/scala/tripaint/control/ActionsTest.scala → app/src/test/scala/tripaint/ActionsTest.scala

@@ -1,12 +1,11 @@
-package tripaint.control
+package tripaint
 
+import tripaint.{Actions, TriPaintModel}
 import tripaint.ScalaFxExt.given
-import tripaint.TriPaintModel
 import tripaint.coords.{GridCoords, StorageCoords}
 import tripaint.image.{ImageStorage, RegularImage}
 import tripaint.image.ImagePool.SaveLocation
 import tripaint.image.format.{SimpleStorageFormat, StorageFormat}
-import tripaint.infrastructure.FileSystem
 import tripaint.view.FileOpenSettings
 
 import munit.FunSuite

app/src/test/scala/tripaint/infrastructure/FileSystemTest.scala → app/src/test/scala/tripaint/FileSystemTest.scala

@@ -1,4 +1,4 @@
-package tripaint.infrastructure
+package tripaint
 
 import tripaint.Color
 import tripaint.image.RegularImage

app/src/test/scala/tripaint/ImageSaverTest.scala

@@ -5,7 +5,6 @@ import tripaint.grid.ImageGrid
 import tripaint.image.{ImageStorage, RegularImage}
 import tripaint.image.ImagePool.{SaveInfo, SaveLocation}
 import tripaint.image.format.SimpleStorageFormat
-import tripaint.infrastructure.FileSystem
 import tripaint.util.Tracker
 
 import munit.FunSuite

app/src/test/scala/tripaint/control/action/NewActionTest.scala → app/src/test/scala/tripaint/NewActionTest.scala

@@ -1,8 +1,5 @@
-package tripaint.control.action
+package tripaint
 
-import tripaint.Color
-import tripaint.TriPaintModel
-import tripaint.control.Actions
 import tripaint.coords.GridCoords
 import tripaint.image.RegularImage
 import tripaint.image.format.SimpleStorageFormat

app/src/test/scala/tripaint/control/action/OpenActionTest.scala → app/src/test/scala/tripaint/OpenActionTest.scala

@@ -1,12 +1,8 @@
-package tripaint.control.action
+package tripaint
 
-import tripaint.Color
-import tripaint.TriPaintModel
-import tripaint.control.Actions
 import tripaint.coords.{GridCoords, StorageCoords}
 import tripaint.image.RegularImage
 import tripaint.image.format.SimpleStorageFormat
-import tripaint.infrastructure.FileSystem
 import tripaint.view.FileOpenSettings
 
 import munit.FunSuite

ui/src/main/scala/tripaint/view/gui/ImageTabPane.scala

@@ -39,6 +39,7 @@ object ImageTabPane {
       b.selected.onChange { (_, _, selected) =>
         image.setEditable(selected)
       }
+      b.selected = image.editable
 
       b
     }
@@ -71,6 +72,7 @@ object ImageTabPane {
         star.visible = changed
       case _ =>
     }
+    star.visible = image.changed
 
     star
   }