More icons

src/main/resources/ocelot/desktop/spritesheet.txt

@@ -1,12 +1,89 @@
 BackgroundPattern 0 0 304 304
-BorderB 308 25 2 8
+Empty 340 197 1 1
-BorderT 305 25 2 10
+ShadowBorder 305 197 1 24
-Circle 305 0 24 24
+ShadowCorner 424 0 24 24
-Computer 355 0 16 16
+buttons/PowerOff 441 25 18 18
-CornerBL 407 0 8 8
+buttons/PowerOn 460 25 18 18
-CornerBR 416 0 8 8
+icons/Card 479 25 16 16
-CornerTL 389 0 8 10
+icons/ComponentBus 424 58 16 16
-CornerTR 398 0 8 10
+icons/EEPROM 441 58 16 16
-DefaultNode 330 0 24 24
+icons/Floppy 458 58 16 16
-Empty 311 25 1 1
+icons/HDD 475 58 16 16
-Screen 372 0 16 16
+icons/Memory 492 58 16 16
+icons/NA 424 75 16 16
+icons/RackMountable 441 75 16 16
+icons/Tier0 458 75 16 16
+icons/Tier1 475 75 16 16
+icons/Tier2 492 75 16 16
+icons/cpu 449 0 16 16
+items/APU0 356 0 16 96
+items/APU1 373 0 16 96
+items/APU2 390 0 16 96
+items/CPU0 466 0 16 16
+items/CPU1 483 0 16 16
+items/CPU2 356 97 16 16
+items/CardBase 373 97 16 16
+items/CircuitBoard 390 97 16 16
+items/ComponentBus0 407 97 16 16
+items/ComponentBus1 424 97 16 16
+items/ComponentBus2 441 97 16 16
+items/ComponentBus3 458 97 16 16
+items/DataCard0 305 0 16 128
+items/DataCard1 322 0 16 128
+items/DataCard2 339 0 16 128
+items/DebugCard 475 97 16 16
+items/DiskDriveMountable 492 97 16 16
+items/EEPROM 305 129 16 16
+items/FloppyDisk_dyeBlack 322 129 16 16
+items/FloppyDisk_dyeBlue 339 129 16 16
+items/FloppyDisk_dyeBrown 356 129 16 16
+items/FloppyDisk_dyeCyan 373 129 16 16
+items/FloppyDisk_dyeGray 390 129 16 16
+items/FloppyDisk_dyeGreen 407 129 16 16
+items/FloppyDisk_dyeLightBlue 424 129 16 16
+items/FloppyDisk_dyeLightGray 441 129 16 16
+items/FloppyDisk_dyeLime 458 129 16 16
+items/FloppyDisk_dyeMagenta 475 129 16 16
+items/FloppyDisk_dyeOrange 492 129 16 16
+items/FloppyDisk_dyePink 305 146 16 16
+items/FloppyDisk_dyePurple 322 146 16 16
+items/FloppyDisk_dyeRed 339 146 16 16
+items/FloppyDisk_dyeWhite 356 146 16 16
+items/FloppyDisk_dyeYellow 373 146 16 16
+items/GraphicsCard0 390 146 16 16
+items/GraphicsCard1 407 146 16 16
+items/GraphicsCard2 424 146 16 16
+items/HardDiskDrive0 441 146 16 16
+items/HardDiskDrive1 458 146 16 16
+items/HardDiskDrive2 475 146 16 16
+items/InternetCard 424 25 16 32
+items/LinkedCard 407 0 16 96
+items/Memory0 492 146 16 16
+items/Memory1 305 163 16 16
+items/Memory2 322 163 16 16
+items/Memory3 339 163 16 16
+items/Memory4 356 163 16 16
+items/Memory5 373 163 16 16
+items/NetworkCard 390 163 16 16
+items/RedstoneCard0 407 163 16 16
+items/RedstoneCard1 424 163 16 16
+items/Server0 441 163 16 16
+items/Server1 458 163 16 16
+items/Server2 475 163 16 16
+items/Server3 492 163 16 16
+items/WirelessNetworkCard0 305 180 16 16
+items/WirelessNetworkCard1 322 180 16 16
+nodes/Computer 339 180 16 16
+nodes/Screen 356 180 16 16
+screen/BorderB 310 197 2 8
+screen/BorderT 307 197 2 10
+screen/CornerBL 391 180 8 8
+screen/CornerBR 400 180 8 8
+screen/CornerTL 373 180 8 10
+screen/CornerTR 382 180 8 10
+window/BorderH 333 197 1 4
+window/BorderV 335 197 4 1
+window/CornerBL 313 197 4 4
+window/CornerBR 318 197 4 4
+window/CornerTL 323 197 4 4
+window/CornerTR 328 197 4 4

src/main/scala/ocelot/desktop/ui/widget/ScreenWidget.scala

@@ -109,14 +109,14 @@ class ScreenWidget(screen: Screen) extends Widget with Logging {
       }
     }
 
-    g.sprite("CornerTL", sx, sy, 16, 20)
+    g.sprite("screen/CornerTL", sx, sy, 16, 20)
-    g.sprite("CornerTR", sx + w - 16, sy, 16, 20)
+    g.sprite("screen/CornerTR", sx + w - 16, sy, 16, 20)
-    g.sprite("CornerBL", sx, sy + h - 16, 16, 16)
+    g.sprite("screen/CornerBL", sx, sy + h - 16, 16, 16)
-    g.sprite("CornerBR", sx + w - 16, sy + h - 16, 16, 16)
+    g.sprite("screen/CornerBR", sx + w - 16, sy + h - 16, 16, 16)
-    g.sprite("BorderT", sx + 16, sy + 0, w - 32, 20)
+    g.sprite("screen/BorderT", sx + 16, sy + 0, w - 32, 20)
-    g.sprite("BorderB", sx + 16, sy + h - 16, w - 32, 16)
+    g.sprite("screen/BorderB", sx + 16, sy + h - 16, w - 32, 16)
-    g.sprite("BorderB", sx + 0, sy + 20, 16, h - 36, 270)
+    g.sprite("screen/BorderB", sx + 0, sy + 20, 16, h - 36, 270)
-    g.sprite("BorderB", sx + w - 16, sy + 20, 16, h - 36, 270)
+    g.sprite("screen/BorderB", sx + w - 16, sy + 20, 16, h - 36, 270)
 
     g.setSmallFont()
     g.background = RGBAColor(0, 0, 0, 0)

src/main/scala/ocelot/desktop/ui/workspace/ComputerNode.scala

@@ -2,5 +2,5 @@ package ocelot.desktop.ui.workspace
 
 class ComputerNode extends Node {
   override var alias: String = "Computer"
-  override val icon: String = "Computer"
+  override val icon: String = "nodes/Computer"
 }

src/main/scala/ocelot/desktop/ui/workspace/Node.scala

@@ -9,7 +9,7 @@ import ocelot.desktop.util.Animation
 trait Node extends Widget {
   var alias: String
 
-  val icon: String = "DefaultNode"
+  val icon: String = "icons/NA"
 
   override def minimumSize: Size2D = Size2D(68, 68)
 

src/main/scala/ocelot/desktop/ui/workspace/ScreenNode.scala

@@ -2,5 +2,5 @@ package ocelot.desktop.ui.workspace
 
 class ScreenNode extends Node {
   override var alias: String = "Screen"
-  override val icon: String = "Screen"
+  override val icon: String = "nodes/Screen"
 }