From 3fbd4f0d782d8d7ac0453f6adfa4a5b32b281dda Mon Sep 17 00:00:00 2001 From: Ingo Maier Date: Wed, 30 Jul 2008 09:48:30 +0000 Subject: Loading images through getResource for the jar,... Loading images through getResource for the jar, fixed SplitPane orientation issue --- src/swing/images/banana.jpg | Bin 5999 -> 0 bytes src/swing/images/margarita1.jpg | Bin 14769 -> 0 bytes src/swing/images/margarita2.jpg | Bin 17309 -> 0 bytes src/swing/images/rose.jpg | Bin 13807 -> 0 bytes src/swing/scala/swing/ListView.scala | 3 +-- src/swing/scala/swing/SplitPane.scala | 2 +- src/swing/scala/swing/UIElement.scala | 1 + src/swing/scala/swing/test/ComboBoxes.scala | 15 +++++++++++---- src/swing/scala/swing/test/UIDemo.scala | 1 - 9 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 src/swing/images/banana.jpg delete mode 100644 src/swing/images/margarita1.jpg delete mode 100644 src/swing/images/margarita2.jpg delete mode 100644 src/swing/images/rose.jpg (limited to 'src/swing') diff --git a/src/swing/images/banana.jpg b/src/swing/images/banana.jpg deleted file mode 100644 index 81fc4ab387..0000000000 Binary files a/src/swing/images/banana.jpg and /dev/null differ diff --git a/src/swing/images/margarita1.jpg b/src/swing/images/margarita1.jpg deleted file mode 100644 index 485723334a..0000000000 Binary files a/src/swing/images/margarita1.jpg and /dev/null differ diff --git a/src/swing/images/margarita2.jpg b/src/swing/images/margarita2.jpg deleted file mode 100644 index c5fefb0bd5..0000000000 Binary files a/src/swing/images/margarita2.jpg and /dev/null differ diff --git a/src/swing/images/rose.jpg b/src/swing/images/rose.jpg deleted file mode 100644 index 5c2e75637e..0000000000 Binary files a/src/swing/images/rose.jpg and /dev/null differ diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala index 4773a5e65c..0460074dd9 100644 --- a/src/swing/scala/swing/ListView.scala +++ b/src/swing/scala/swing/ListView.scala @@ -131,10 +131,9 @@ class ListView[A] extends Component { peer.setModel(new AbstractListModel { def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef] def getSize = items.size - }) + }) } - object selection extends Publisher { protected abstract class Indices[A](a: =>Seq[A]) extends scala.collection.mutable.Set[A] { def -=(n: A) diff --git a/src/swing/scala/swing/SplitPane.scala b/src/swing/scala/swing/SplitPane.scala index 747dc4eb29..a5026adad7 100644 --- a/src/swing/scala/swing/SplitPane.scala +++ b/src/swing/scala/swing/SplitPane.scala @@ -8,7 +8,7 @@ import Swing._ */ class SplitPane(o: Orientation.Value, left: Component, right: Component) extends Component with Container with Orientable { override lazy val peer: javax.swing.JSplitPane = new javax.swing.JSplitPane(o.id, left.peer, right.peer) - def this(o: Orientation.Value) = this(Orientation.Horizontal, new Component {}, new Component {}) + def this(o: Orientation.Value) = this(o, new Component {}, new Component {}) def this() = this(Orientation.Horizontal) def contents: Seq[Component] = List(leftComponent, rightComponent) diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala index 22370d33b0..843262bcab 100644 --- a/src/swing/scala/swing/UIElement.scala +++ b/src/swing/scala/swing/UIElement.scala @@ -8,6 +8,7 @@ import java.awt.{Color, Cursor, Font, Dimension} trait UIElement extends Proxy { def peer: java.awt.Component def self = peer + def foreground: Color = peer.getForeground def foreground_=(c: Color) = peer.setForeground(c) def background: Color = peer.getBackground diff --git a/src/swing/scala/swing/test/ComboBoxes.scala b/src/swing/scala/swing/test/ComboBoxes.scala index 961866a815..2d0767f299 100644 --- a/src/swing/scala/swing/test/ComboBoxes.scala +++ b/src/swing/scala/swing/test/ComboBoxes.scala @@ -50,10 +50,17 @@ object ComboBoxes extends SimpleGUIApplication { } } - val icons = List(new ImageIcon(resourceFromUserDirectory("swing/images/margarita1.jpg").toURL), - new ImageIcon(resourceFromUserDirectory("swing/images/margarita2.jpg").toURL), - new ImageIcon(resourceFromUserDirectory("swing/images/rose.jpg").toURL), - new ImageIcon(resourceFromUserDirectory("swing/images/banana.jpg").toURL)) + + val icons = try { + List(new ImageIcon(resourceFromClassloader("images/margarita1.jpg")), + new ImageIcon(resourceFromClassloader("images/margarita2.jpg")), + new ImageIcon(resourceFromClassloader("images/rose.jpg")), + new ImageIcon(resourceFromClassloader("images/banana.jpg"))) + } catch { + case _ => + println("Couldn't load images for combo box") + List(scala.swing.Icon.Empty) + } val iconBox = new ComboBox(icons) { renderer = new ListView.AbstractRenderer[Icon, Label](new Label) { diff --git a/src/swing/scala/swing/test/UIDemo.scala b/src/swing/scala/swing/test/UIDemo.scala index 4faaebbb93..f92569c187 100644 --- a/src/swing/scala/swing/test/UIDemo.scala +++ b/src/swing/scala/swing/test/UIDemo.scala @@ -63,7 +63,6 @@ object UIDemo extends SimpleGUIApplication { case ButtonClicked(`snapTicks`) => slider.snapToTicks = snapTicks.selected case ButtonClicked(`live`) => - println("") reactLive = live.selected } } -- cgit v1.2.3