Improved the IDE: can now create new packages and source files within the IDE

Constructor/src/main/java/org/openzen/zenscript/constructor/module/DirectoryModuleLoader.java

@@ -106,7 +106,7 @@ public class DirectoryModuleLoader implements ModuleReference {
 	}
 	
 	private SourcePackage loadPackage(String name, File directory) {
-		SourcePackage pkg = new SourcePackage(name);
+		SourcePackage pkg = new SourcePackage(directory, name);
 		
 		for (File file : directory.listFiles()) {
 			if (file.isDirectory()) {

Constructor/src/main/java/org/openzen/zenscript/constructor/module/SourcePackage.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.constructor.module;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -13,11 +14,13 @@ import java.util.Map;
  * @author Hoofdgebruiker
  */
 public class SourcePackage {
+	public final File directory;
 	public final String name;
 	public final Map<String, SourcePackage> subPackages = new HashMap<>();
 	public final Map<String, SourceFile> sourceFiles = new HashMap<>();
 	
-	public SourcePackage(String name) {
+	public SourcePackage(File directory, String name) {
+		this.directory = directory;
 		this.name = name;
 	}
 	

DrawableGui/src/main/java/org/openzen/drawablegui/DButton.java

@@ -9,6 +9,7 @@ import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 
@@ -21,6 +22,7 @@ public class DButton implements DComponent {
 	private final LiveString label;
 	private final LiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
 	private final LiveBool disabled;
+	private final Runnable action;
 	
 	private DUIContext context;
 	private DIRectangle bounds;
@@ -31,10 +33,11 @@ public class DButton implements DComponent {
 	private boolean hovering = false;
 	private boolean pressing = false;
 	
-	public DButton(DStyleClass styleClass, LiveString label, LiveBool disabled) {
+	public DButton(DStyleClass styleClass, LiveString label, LiveBool disabled, Runnable action) {
 		this.styleClass = styleClass;
 		this.label = label;
 		this.disabled = disabled;
+		this.action = action;
 	}
 
 	@Override
@@ -44,6 +47,10 @@ public class DButton implements DComponent {
 		DStylePath path = parent.getChild("Button", styleClass);
 		this.style = new DButtonStyle(context.getStylesheets().get(context, path));
 		fontMetrics = context.getFontMetrics(style.font);
+		
+		dimensionPreferences.setValue(new DDimensionPreferences(
+				style.paddingLeft + style.paddingRight + fontMetrics.getWidth(label.getValue()),
+				style.paddingTop + style.paddingBottom + fontMetrics.getAscent() + fontMetrics.getDescent()));
 	}
 
 	@Override
@@ -69,14 +76,24 @@ public class DButton implements DComponent {
 	@Override
 	public void paint(DCanvas canvas) {
 		int backgroundColor = style.backgroundColorNormal;
-		if (hovering)
+		DShadow shadow = style.shadowNormal;
+		if (hovering) {
 			backgroundColor = style.backgroundColorHover;
-		if (pressing)
+			shadow = style.shadowNormal;
+		}
+		if (pressing) {
 			backgroundColor = style.backgroundColorPress;
-		if (disabled.getValue())
+			shadow = style.shadowPress;
+		}
+		if (disabled.getValue()) {
 			backgroundColor = style.backgroundColorDisabled;
+			shadow = style.shadowDisabled;
+		}
 		
-		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, backgroundColor);
+		DPath shape = DPath.roundedRectangle(bounds.x, bounds.y, bounds.width, bounds.height, 2 * context.getScale());
+		canvas.shadowPath(shape, DTransform2D.IDENTITY, shadow);
+		canvas.fillPath(shape, DTransform2D.IDENTITY, backgroundColor);
+		canvas.drawText(style.font, style.textColor, bounds.x + style.paddingLeft, bounds.y + style.paddingTop + fontMetrics.getAscent(), label.getValue());
 	}
 
 	@Override
@@ -108,7 +125,7 @@ public class DButton implements DComponent {
 		pressing = false;
 		
 		if (!disabled.getValue()) {
-			// TODO
+			action.run();
 		}
 		
 		repaint();

DrawableGui/src/main/java/org/openzen/drawablegui/DButtonStyle.java

@@ -35,8 +35,8 @@ public class DButtonStyle {
 	public DButtonStyle(DStyleDefinition style) {
 		this.paddingTop = style.getDimension("paddingTop", new DDpDimension(4));
 		this.paddingBottom = style.getDimension("paddingBottom", new DDpDimension(4));
-		this.paddingLeft = style.getDimension("paddingLeft", new DDpDimension(4));
-		this.paddingRight = style.getDimension("paddingRight", new DDpDimension(4));
+		this.paddingLeft = style.getDimension("paddingLeft", new DDpDimension(8));
+		this.paddingRight = style.getDimension("paddingRight", new DDpDimension(8));
 		font = style.getFont("font", context -> new DFont(DFontFamily.UI, false, false, false, (int)(14 * context.getTextScale())));
 		textColor = style.getColor("textColor", 0xFF000000);
 		textColorDisabled = style.getColor("textColorDisabled", 0xFF888888);
@@ -46,9 +46,9 @@ public class DButtonStyle {
 		backgroundColorPress = style.getColor("backgroundColorPress", 0xFFE5EFF8);
 		backgroundColorDisabled = style.getColor("backgroundColorDisabled", 0xFFE5EFF8);
 		
-		shadowNormal = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
-		shadowHover = style.getShadow("shadowHover", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
-		shadowPress = style.getShadow("shadowPress", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
-		shadowDisabled = style.getShadow("shadowDisabled", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()));
+		shadowNormal = style.getShadow("shadowNormal", context -> new DShadow(0xFF888888, 0, 1f * context.getScale(), 4 * context.getScale()));
+		shadowHover = style.getShadow("shadowHover", context -> new DShadow(0xFF888888, 0, 1f * context.getScale(), 4 * context.getScale()));
+		shadowPress = style.getShadow("shadowPress", context -> new DShadow(0xFF888888, 0, 1f * context.getScale(), 3 * context.getScale()));
+		shadowDisabled = style.getShadow("shadowDisabled", context -> new DShadow(0xFF888888, 0, 1f * context.getScale(), 3 * context.getScale()));
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DHorizontalLayout.java

@@ -93,6 +93,7 @@ public class DHorizontalLayout extends BaseComponentGroup {
 	@Override
 	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
+		layout();
 	}
 
 	@Override
@@ -197,7 +198,7 @@ public class DHorizontalLayout extends BaseComponentGroup {
 				DDimensionPreferences preferences = element.component.getDimensionPreferences().getValue();
 				int newX = x + preferences.preferredWidth;
 				layout(element, x, newX - x);
-				x = newX;
+				x = newX + style.spacing;
 			}
 		} else {
 			int delta = bounds.width - myPreferences.preferredWidth;
@@ -237,7 +238,7 @@ public class DHorizontalLayout extends BaseComponentGroup {
 				y = bounds.y + style.paddingTop;
 				break;
 		}
-		element.component.setBounds(new DIRectangle(bounds.x + x, y, width, height));
+		element.component.setBounds(new DIRectangle(x, y, width, height));
 	}
 	
 	private void updateDimensionPreferences() {

DrawableGui/src/main/java/org/openzen/drawablegui/DInputField.java

@@ -8,6 +8,7 @@ package org.openzen.drawablegui;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.LiveString;
+import org.openzen.drawablegui.live.MutableLiveString;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DDimension;
 import org.openzen.drawablegui.style.DStyleClass;
@@ -18,7 +19,7 @@ import org.openzen.drawablegui.style.DStylePath;
  * @author Hoofdgebruiker
  */
 public class DInputField implements DComponent {
-	public final LiveString value;
+	public final MutableLiveString value;
 	private final ListenerHandle<LiveString.Listener> valueListener;
 	
 	private final DStyleClass styleClass;
@@ -32,10 +33,13 @@ public class DInputField implements DComponent {
 	private int cursorFrom = -1;
 	private int cursorTo = -1;
 	
+	private Runnable onEnter = null;
+	private Runnable onEscape = null;
+	
 	private boolean cursorBlink = true;
 	private DTimerHandle blinkTimer;
 	
-	public DInputField(DStyleClass styleClass, LiveString value, DDimension preferredWidth) {
+	public DInputField(DStyleClass styleClass, MutableLiveString value, DDimension preferredWidth) {
 		this.styleClass = styleClass;
 		this.value = value;
 		this.preferredWidth = preferredWidth;
@@ -45,6 +49,14 @@ public class DInputField implements DComponent {
 		cursorTo = value.getValue().length();
 	}
 	
+	public void setOnEnter(Runnable onEnter) {
+		this.onEnter = onEnter;
+	}
+	
+	public void setOnEscape(Runnable onEscape) {
+		this.onEscape = onEscape;
+	}
+	
 	@Override
 	public void close() {
 		valueListener.close();
@@ -126,6 +138,16 @@ public class DInputField implements DComponent {
 		}
 	}
 	
+	@Override
+	public void onMouseEnter(DMouseEvent e) {
+		context.setCursor(DUIContext.Cursor.TEXT);
+	}
+	
+	@Override
+	public void onMouseExit(DMouseEvent e) {
+		context.setCursor(DUIContext.Cursor.NORMAL);
+	}
+	
 	@Override
 	public void onMouseClick(DMouseEvent e) {
 		context.getWindow().focus(this);
@@ -160,6 +182,9 @@ public class DInputField implements DComponent {
 			case ENTER:
 				enter();
 				break;
+			case ESCAPE:
+				escape();
+				break;
 			default:
 				if (e.character == DKeyEvent.CHAR_UNDEFINED)
 					return;
@@ -218,6 +243,12 @@ public class DInputField implements DComponent {
 	}
 	
 	private void enter() {
-		
+		if (onEnter != null)
+			onEnter.run();
+	}
+	
+	private void escape() {
+		if (onEscape != null)
+			onEscape.run();
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DLabel.java

@@ -0,0 +1,89 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui;
+
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.LiveString;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DLabel implements DComponent {
+	private final LiveString label;
+	private final DStyleClass styleClass;
+	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	private final ListenerHandle<LiveString.Listener> labelListener;
+	
+	private DUIContext context;
+	private DIRectangle bounds;
+	private DLabelStyle style;
+	private DFontMetrics fontMetrics;
+	
+	public DLabel(DStyleClass styleClass, LiveString label) {
+		this.styleClass = styleClass;
+		this.label = label;
+		
+		labelListener = label.addListener(this::onLabelChanged);
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		
+		DStylePath path = parent.getChild("label", styleClass);
+		style = new DLabelStyle(context.getStylesheets().get(context, path));
+		
+		fontMetrics = context.getFontMetrics(style.font);
+		calculateDimension();
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public int getBaselineY() {
+		return style.border.getPaddingTop() + fontMetrics.getAscent();
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		style.border.paint(canvas, bounds);
+		canvas.drawText(style.font, style.color, bounds.x + style.border.getPaddingLeft(), bounds.y + style.border.getPaddingTop() + fontMetrics.getAscent(), label.getValue());
+	}
+
+	@Override
+	public void close() {
+		labelListener.close();
+	}
+	
+	private void onLabelChanged(String oldValue, String newValue) {
+		calculateDimension();
+		context.repaint(bounds);
+	}
+	
+	private void calculateDimension() {
+		preferences.setValue(new DDimensionPreferences(
+			style.border.getPaddingLeft() + fontMetrics.getWidth(label.getValue()) + style.border.getPaddingRight(),
+			style.border.getPaddingTop() + fontMetrics.getAscent() + fontMetrics.getDescent() + style.border.getPaddingTop()));
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DLabelStyle.java

@@ -0,0 +1,30 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui;
+
+import org.openzen.drawablegui.border.DBorder;
+import org.openzen.drawablegui.border.DPaddedBorder;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DLabelStyle {
+	public final DBorder border;
+	public final DFont font;
+	public final int color;
+	
+	public DLabelStyle(DStyleDefinition style) {
+		border = style.getBorder("border", context -> new DPaddedBorder(
+				(int)(4 * context.getScale()),
+				(int)(4 * context.getScale()),
+				(int)(4 * context.getScale()),
+				(int)(4 * context.getScale())));
+		font = style.getFont("font", context -> new DFont(DFontFamily.UI, false, false, false, (int)(14 * context.getTextScale())));
+		color = style.getColor("color", 0xFF000000);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DUIContext.java

@@ -40,6 +40,10 @@ public interface DUIContext {
 	
 	DUIWindow openView(int x, int y, DAnchor anchor, DComponent root);
 	
+	default int dp(float dp) {
+		return (int)(dp * getScale());
+	}
+	
 	enum Cursor {
 		NORMAL,
 		HAND,

DrawableGui/src/main/java/org/openzen/drawablegui/DVerticalLayout.java

@@ -93,6 +93,7 @@ public class DVerticalLayout extends BaseComponentGroup {
 	@Override
 	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
+		layout();
 	}
 
 	@Override
@@ -206,8 +207,8 @@ public class DVerticalLayout extends BaseComponentGroup {
 			for (Element element : components) {
 				DDimensionPreferences preferences = element.component.getDimensionPreferences().getValue();
 				float scaledSize = preferences.preferredHeight + deltaScaled * element.grow;
-				float idealUnspacedX = y + scaledSize;
-				int newY = (int)(idealUnspacedX + 0.5f);
+				float idealUnspacedY = y + scaledSize;
+				int newY = (int)(idealUnspacedY + 0.5f);
 				layout(element, y, newY - y);
 				y = newY + style.spacing;
 			}

DrawableGui/src/main/java/org/openzen/drawablegui/border/DEmptyBorder.java

@@ -16,6 +16,8 @@ import org.openzen.drawablegui.DUIContext;
 public class DEmptyBorder implements DBorder {
 	public static final DEmptyBorder INSTANCE = new DEmptyBorder();
 	
+	private DEmptyBorder() {}
+	
 	@Override
 	public void paint(DCanvas canvas, DIRectangle bounds) {
 		

DrawableGui/src/main/java/org/openzen/drawablegui/border/DPaddedBorder.java

@@ -0,0 +1,52 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.border;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DIRectangle;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DPaddedBorder implements DBorder {
+	private final int left;
+	private final int top;
+	private final int right;
+	private final int bottom;
+	
+	public DPaddedBorder(int left, int top, int right, int bottom) {
+		this.left = left;
+		this.top = top;
+		this.right = right;
+		this.bottom = bottom;
+	}
+
+	@Override
+	public void paint(DCanvas canvas, DIRectangle bounds) {
+		// nothing to paint
+	}
+
+	@Override
+	public int getPaddingLeft() {
+		return left;
+	}
+
+	@Override
+	public int getPaddingRight() {
+		return right;
+	}
+
+	@Override
+	public int getPaddingTop() {
+		return top;
+	}
+
+	@Override
+	public int getPaddingBottom() {
+		return bottom;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/ImmutableLiveBool.java

@@ -27,11 +27,6 @@ public class ImmutableLiveBool implements LiveBool {
 		return value;
 	}
 
-	@Override
-	public void setValue(boolean value) {
-		throw new UnsupportedOperationException("Cannot modify an immutable value");
-	}
-
 	@Override
 	public ListenerHandle<Listener> addListener(Listener listener) {
 		return new DummyListenerHandle<>(listener);

DrawableGui/src/main/java/org/openzen/drawablegui/live/ImmutableLiveString.java

@@ -0,0 +1,31 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.live;
+
+import org.openzen.drawablegui.listeners.DummyListenerHandle;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ImmutableLiveString implements LiveString {
+	private final String value;
+
+	public ImmutableLiveString(String value) {
+		this.value = value;
+	}
+	
+	@Override
+	public ListenerHandle<Listener> addListener(Listener listener) {
+		return new DummyListenerHandle<>(listener);
+	}
+
+	@Override
+	public String getValue() {
+		return value;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveArrayList.java

@@ -15,7 +15,7 @@ import org.openzen.drawablegui.listeners.ListenerList;
  *
  * @author Hoofdgebruiker
  */
-public class LiveArrayList<T> implements LiveList<T> {
+public class LiveArrayList<T> implements MutableLiveList<T> {
 	private final List<T> values = new ArrayList<>();
 	private final ListenerList<Listener<T>> listeners = new ListenerList<>();
 
@@ -67,6 +67,11 @@ public class LiveArrayList<T> implements LiveList<T> {
 	public T get(int index) {
 		return values.get(index);
 	}
+	
+	@Override
+	public void close() {
+		// TODO: close closeables
+	}
 
 	@Override
 	public Iterator<T> iterator() {

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveBool.java

@@ -14,12 +14,6 @@ import org.openzen.drawablegui.listeners.ListenerHandle;
 public interface LiveBool {
 	public boolean getValue();
 	
-	public void setValue(boolean value);
-	
-	default void toggle() {
-		setValue(!getValue());
-	}
-	
 	public ListenerHandle<Listener> addListener(Listener listener);
 	
 	public interface Listener {

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveConcatList.java

@@ -36,31 +36,6 @@ public class LiveConcatList<T> implements Closeable, LiveList<T> {
 		bListener.close();
 	}
 
-	@Override
-	public void add(T value) {
-		throw new UnsupportedOperationException("Cannot modify a concat list");
-	}
-
-	@Override
-	public void add(int index, T value) {
-		throw new UnsupportedOperationException("Cannot modify a concat list");
-	}
-
-	@Override
-	public void set(int index, T value) {
-		throw new UnsupportedOperationException("Cannot modify a concat list");
-	}
-
-	@Override
-	public void remove(int index) {
-		throw new UnsupportedOperationException("Cannot modify a concat list");
-	}
-
-	@Override
-	public void remove(T value) {
-		throw new UnsupportedOperationException("Cannot modify a concat list");
-	}
-
 	@Override
 	public int indexOf(T value) {
 		int result = a.indexOf(value);

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveEmptyList.java

@@ -20,30 +20,10 @@ public class LiveEmptyList<T> implements LiveList<T> {
 	public static <T> LiveEmptyList<T> get() {
 		return INSTANCE;
 	}
-
-	@Override
-	public void add(T value) {
-		throw new UnsupportedOperationException("Immutable list");
-	}
-
-	@Override
-	public void add(int index, T value) {
-		throw new UnsupportedOperationException("Immutable list");
-	}
-
-	@Override
-	public void set(int index, T value) {
-		throw new UnsupportedOperationException("Immutable list");
-	}
-
-	@Override
-	public void remove(int index) {
-		throw new UnsupportedOperationException("Immutable list");
-	}
-
+	
 	@Override
-	public void remove(T value) {
-		throw new UnsupportedOperationException("Immutable list");
+	public void close() {
+		
 	}
 
 	@Override

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveList.java

@@ -13,22 +13,14 @@ import org.openzen.drawablegui.listeners.ListenerHandle;
  * @author Hoofdgebruiker
  */
 public interface LiveList<T> extends Iterable<T> {
-	void add(T value);
-	
-	void add(int index, T value);
-	
-	void set(int index, T value);
-	
-	void remove(int index);
-	
-	void remove(T value);
-	
 	int indexOf(T value);
 	
 	int size();
 	
 	T get(int index);
 	
+	void close();
+	
 	@Override
 	Iterator<T> iterator();
 	

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveMappedList.java

@@ -37,31 +37,6 @@ public class LiveMappedList<T, U> implements Closeable, LiveList<U> {
 		mappingListenerHandle.close();
 	}
 
-	@Override
-	public void add(U value) {
-		throw new UnsupportedOperationException("Cannot modify a mapped list");
-	}
-
-	@Override
-	public void add(int index, U value) {
-		throw new UnsupportedOperationException("Cannot modify a mapped list");
-	}
-
-	@Override
-	public void set(int index, U value) {
-		throw new UnsupportedOperationException("Cannot modify a mapped list");
-	}
-
-	@Override
-	public void remove(int index) {
-		throw new UnsupportedOperationException("Cannot modify a mapped list");
-	}
-
-	@Override
-	public void remove(U value) {
-		throw new UnsupportedOperationException("Cannot modify a mapped list");
-	}
-
 	@Override
 	public int indexOf(U value) {
 		return mapped.indexOf(value);

DrawableGui/src/main/java/org/openzen/drawablegui/live/LivePredicateBool.java

@@ -32,11 +32,6 @@ public class LivePredicateBool<T> implements LiveBool, Closeable, LiveObject.Lis
 	public void close() {
 		sourceListener.close();
 	}
-	
-	@Override
-	public void setValue(boolean value) {
-		throw new UnsupportedOperationException("Cannot modify a calculated value");
-	}
 
 	@Override
 	public boolean getValue() {

DrawableGui/src/main/java/org/openzen/drawablegui/live/LivePrefixedList.java

@@ -17,13 +17,20 @@ public class LivePrefixedList<T> implements LiveList<T> {
 	private final ListenerList<Listener<T>> listeners = new ListenerList<>();
 	private final T prefix;
 	private final LiveList<T> values;
+	private final ListenerHandle<LiveList.Listener<T>> baseListener;
 	
 	public LivePrefixedList(T prefix, LiveList<T> values) {
 		this.prefix = prefix;
 		this.values = values;
+		this.baseListener = values.addListener(new BaseListener());
 	}
-
+	
 	@Override
+	public void close() {
+		baseListener.close();
+	}
+
+	/*@Override
 	public void add(T value) {
 		values.add(value);
 	}
@@ -54,7 +61,7 @@ public class LivePrefixedList<T> implements LiveList<T> {
 	@Override
 	public void remove(T value) {
 		values.remove(value);
-	}
+	}*/
 
 	@Override
 	public int indexOf(T value) {

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveString.java

@@ -16,8 +16,6 @@ public interface LiveString {
 	
 	String getValue();
 	
-	void setValue(String value);
-	
 	interface Listener {
 		void onChanged(String oldValue, String newValue);
 	}

DrawableGui/src/main/java/org/openzen/drawablegui/live/MutableLiveBool.java

@@ -0,0 +1,18 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.live;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface MutableLiveBool extends LiveBool {
+	void setValue(boolean value);
+	
+	default void toggle() {
+		setValue(!getValue());
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/MutableLiveList.java

@@ -0,0 +1,22 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.live;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface MutableLiveList<T> extends LiveList<T> {
+	void add(T value);
+	
+	void add(int index, T value);
+	
+	void set(int index, T value);
+	
+	void remove(int index);
+	
+	void remove(T value);
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/MutableLiveString.java

@@ -0,0 +1,14 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.live;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface MutableLiveString extends LiveString {
+	void setValue(String value);
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/SimpleLiveBool.java

@@ -12,7 +12,7 @@ import org.openzen.drawablegui.listeners.ListenerList;
  *
  * @author Hoofdgebruiker
  */
-public class SimpleLiveBool implements LiveBool {
+public class SimpleLiveBool implements MutableLiveBool {
 	private final ListenerList<LiveBool.Listener> listeners = new ListenerList<>();
 	private boolean value;
 	

DrawableGui/src/main/java/org/openzen/drawablegui/live/SimpleLiveString.java

@@ -12,7 +12,7 @@ import org.openzen.drawablegui.listeners.ListenerList;
  *
  * @author Hoofdgebruiker
  */
-public class SimpleLiveString implements LiveString {
+public class SimpleLiveString implements MutableLiveString {
 	private final ListenerList<Listener> listeners = new ListenerList<>();
 	
 	private String value;

DrawableGui/src/main/java/org/openzen/drawablegui/live/SortedLiveList.java

@@ -0,0 +1,104 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.live;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.listeners.ListenerList;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SortedLiveList<T> implements LiveList<T>, LiveList.Listener<T> {
+	private final LiveList<T> original;
+	private final Comparator<T> ordering;
+	private final List<T> sorted;
+	private final ListenerHandle<LiveList.Listener<T>> originalListener;
+	private final ListenerList<Listener<T>> listeners = new ListenerList<>();
+	
+	public SortedLiveList(LiveList<T> original, Comparator<T> ordering) {
+		this.original = original;
+		this.ordering = ordering;
+		
+		sorted = new ArrayList<>();
+		for (T item : original)
+			sorted.add(item);
+		
+		Collections.sort(sorted, ordering);
+		originalListener = original.addListener(this);
+	}
+	
+	@Override
+	public void close() {
+		original.close();
+		originalListener.close();
+	}
+
+	@Override
+	public int indexOf(T value) {
+		return sorted.indexOf(value);
+	}
+
+	@Override
+	public int size() {
+		return sorted.size();
+	}
+
+	@Override
+	public T get(int index) {
+		return sorted.get(index);
+	}
+
+	@Override
+	public Iterator<T> iterator() {
+		return sorted.iterator();
+	}
+
+	@Override
+	public ListenerHandle<Listener<T>> addListener(Listener<T> listener) {
+		return listeners.add(listener);
+	}
+
+	@Override
+	public void onInserted(int index, T value) {
+		internalAdd(value);
+	}
+
+	@Override
+	public void onChanged(int index, T oldValue, T newValue) {
+		internalRemove(oldValue);
+		internalAdd(newValue);
+	}
+
+	@Override
+	public void onRemoved(int index, T oldValue) {
+		internalRemove(oldValue);
+	}
+	
+	private void internalAdd(T value) {
+		int atIndex = 0;
+		while (atIndex < sorted.size() && ordering.compare(value, sorted.get(atIndex)) > 0)
+			atIndex++;
+		
+		sorted.add(atIndex, value);
+		final int finalAtIndex = atIndex;
+		listeners.accept(listener -> listener.onInserted(finalAtIndex, value));
+	}
+	
+	private void internalRemove(T value) {
+		int index = sorted.indexOf(value);
+		if (index < 0)
+			return;
+		
+		sorted.remove(index);
+		listeners.accept(listener -> listener.onRemoved(index, value));
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingDialog.java

@@ -87,7 +87,7 @@ public final class SwingDialog extends JDialog implements WindowListener, Window
 
 	@Override
 	public void close() {
-		System.exit(0);
+		dispose();
 	}
 
 	@Override

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeNode.java

@@ -7,21 +7,23 @@ package org.openzen.drawablegui.tree;
 
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.MutableLiveBool;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public interface DTreeNode<N extends DTreeNode<N>> {
+	void close();
+	
 	DColorableIcon getIcon();
 	
 	String getTitle();
 	
 	LiveList<N> getChildren();
 	
-	LiveBool isCollapsed();
+	MutableLiveBool isCollapsed();
 	
 	boolean isLeaf();
 	

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeView.java

@@ -21,6 +21,7 @@ import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.style.DStylePath;
 
 /**
@@ -217,15 +218,17 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		// nothing to clean up
 	}
 	
-	private class Row implements Closeable, LiveBool.Listener {
+	private class Row implements Closeable, LiveBool.Listener, LiveList.Listener<N> {
 		private final int x;
 		private final N node;
 		private final ListenerHandle<LiveBool.Listener> collapseListener;
+		private final ListenerHandle<LiveList.Listener<N>> childListener;
 		
 		public Row(int x, N node) {
 			this.x = x;
 			this.node = node;
 			this.collapseListener = node.isCollapsed().addListener(this);
+			this.childListener = node.getChildren().addListener(this);
 		}
 
 		@Override
@@ -233,10 +236,29 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			updateLayout();
 			context.repaint(bounds);
 		}
+
+		@Override
+		public void onInserted(int index, N value) {
+			updateLayout();
+			context.repaint(bounds);
+		}
+
+		@Override
+		public void onChanged(int index, N oldValue, N newValue) {
+			updateLayout();
+			context.repaint(bounds);
+		}
+
+		@Override
+		public void onRemoved(int index, N oldValue) {
+			updateLayout();
+			context.repaint(bounds);
+		}
 		
 		@Override
 		public void close() {
 			collapseListener.close();
+			childListener.close();
 		}
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/IDEPackage.java

@@ -17,4 +17,8 @@ public interface IDEPackage {
 	public LiveList<IDEPackage> getSubPackages();
 	
 	public LiveList<IDESourceFile> getSourceFiles();
+	
+	public IDEPackage createSubPackage(String name);
+	
+	public IDESourceFile createSourceFile(String name);
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalLibrary.java

@@ -7,6 +7,7 @@ package org.openzen.zenscript.ide.host.local;
 
 import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.MutableLiveList;
 import org.openzen.zenscript.constructor.Library;
 import org.openzen.zenscript.constructor.module.ModuleReference;
 import org.openzen.zenscript.ide.host.IDELibrary;
@@ -18,7 +19,7 @@ import org.openzen.zenscript.ide.host.IDEModule;
  */
 public class LocalLibrary implements IDELibrary {
 	private final Library library;
-	private final LiveList<IDEModule> modules;
+	private final MutableLiveList<IDEModule> modules;
 	
 	public LocalLibrary(Library library) {
 		this.library = library;

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalModule.java

@@ -15,9 +15,11 @@ import org.openzen.zenscript.ide.host.IDEPackage;
  */
 public class LocalModule implements IDEModule {
 	private final ModuleReference module;
+	private final LocalPackage rootPackage;
 	
 	public LocalModule(ModuleReference module) {
 		this.module = module;
+		rootPackage = new LocalPackage(module.getRootPackage());
 	}
 
 	@Override
@@ -27,6 +29,6 @@ public class LocalModule implements IDEModule {
 
 	@Override
 	public IDEPackage getRootPackage() {
-		return new LocalPackage(module.getRootPackage());
+		return rootPackage;
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalPackage.java

@@ -5,9 +5,14 @@
  */
 package org.openzen.zenscript.ide.host.local;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.MutableLiveList;
+import org.openzen.drawablegui.live.SortedLiveList;
+import org.openzen.zenscript.constructor.module.SourceFile;
 import org.openzen.zenscript.constructor.module.SourcePackage;
 import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.ide.host.IDESourceFile;
@@ -18,8 +23,11 @@ import org.openzen.zenscript.ide.host.IDESourceFile;
  */
 public class LocalPackage implements IDEPackage {
 	private final SourcePackage pkg;
-	private final LiveList<IDEPackage> subPackages = new LiveArrayList<>();
-	private final LiveList<IDESourceFile> sourceFiles = new LiveArrayList<>();
+	private final MutableLiveList<IDEPackage> subPackages = new LiveArrayList<>();
+	private final MutableLiveList<IDESourceFile> sourceFiles = new LiveArrayList<>();
+	
+	private final LiveList<IDEPackage> subPackagesSorted;
+	private final LiveList<IDESourceFile> sourceFilesSorted;
 	
 	public LocalPackage(SourcePackage pkg) {
 		this.pkg = pkg;
@@ -32,12 +40,15 @@ public class LocalPackage implements IDEPackage {
 				.toArray(new String[pkg.sourceFiles.size()]);
 		Arrays.sort(sourceFileKeys);
 		
-		for (String subKey : subPackageKeys) {
-			subPackages.add(new LocalPackage(pkg.subPackages.get(subKey)));
+		for (SourcePackage subPackage : pkg.subPackages.values()) {
+			subPackages.add(new LocalPackage(subPackage));
 		}
-		for (String sourceFileKey : sourceFileKeys) {
-			sourceFiles.add(new LocalSourceFile(pkg.sourceFiles.get(sourceFileKey)));
+		for (SourceFile sourceFile : pkg.sourceFiles.values()) {
+			sourceFiles.add(new LocalSourceFile(sourceFile));
 		}
+		
+		subPackagesSorted = new SortedLiveList<>(subPackages, (a, b) -> a.getName().compareTo(b.getName()));
+		sourceFilesSorted = new SortedLiveList<>(sourceFiles, (a, b) -> a.getName().compareTo(b.getName()));
 	}
 	
 	@Override
@@ -47,11 +58,39 @@ public class LocalPackage implements IDEPackage {
 
 	@Override
 	public LiveList<IDEPackage> getSubPackages() {
-		return subPackages;
+		return subPackagesSorted;
 	}
 
 	@Override
 	public LiveList<IDESourceFile> getSourceFiles() {
-		return sourceFiles;
+		return sourceFilesSorted;
+	}
+	
+	@Override
+	public IDEPackage createSubPackage(String name) {
+		File file = new File(this.pkg.directory, name);
+		file.mkdir();
+		
+		SourcePackage sourcePackage = new SourcePackage(file, name);
+		IDEPackage pkg = new LocalPackage(sourcePackage);
+		this.pkg.subPackages.put(name, sourcePackage);
+		subPackages.add(pkg);
+		return pkg;
+	}
+	
+	@Override
+	public IDESourceFile createSourceFile(String name) {
+		File file = new File(this.pkg.directory, name);
+		try {
+			file.createNewFile();
+		} catch (IOException ex) {
+			ex.printStackTrace(); // TODO
+		}
+		
+		SourceFile sourceFile = new SourceFile(name, file);
+		IDESourceFile localSourceFile = new LocalSourceFile(sourceFile);
+		this.pkg.sourceFiles.put(name, sourceFile);
+		sourceFiles.add(localSourceFile);
+		return localSourceFile;
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalProjectDevelopmentHost.java

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.ide.host.local;
 
-import java.util.List;
 import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.MutableLiveList;
 import org.openzen.zenscript.constructor.Library;
 import org.openzen.zenscript.constructor.Project;
 import org.openzen.zenscript.constructor.module.ModuleReference;
@@ -23,9 +23,9 @@ import org.openzen.zenscript.ide.host.IDETarget;
  */
 public class LocalProjectDevelopmentHost implements DevelopmentHost {
 	private final Project project;
-	private final LiveList<IDEModule> modules;
-	private final LiveList<IDELibrary> libraries;
-	private final LiveList<IDETarget> targets;
+	private final MutableLiveList<IDEModule> modules;
+	private final MutableLiveList<IDELibrary> libraries;
+	private final MutableLiveList<IDETarget> targets;
 	
 	public LocalProjectDevelopmentHost(Project project) {
 		this.project = project;

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEAspectBar.java

@@ -6,8 +6,8 @@
 package org.openzen.zenscript.ide.ui;
 
 import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.MutableLiveList;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 
 /**
@@ -15,6 +15,6 @@ import org.openzen.drawablegui.live.SimpleLiveObject;
  * @author Hoofdgebruiker
  */
 public class IDEAspectBar {
-	public final LiveList<IDEAspectToolbar> toolbars = new LiveArrayList<>();
+	public final MutableLiveList<IDEAspectToolbar> toolbars = new LiveArrayList<>();
 	public final LiveObject<IDEAspectToolbar> active = new SimpleLiveObject<>(null);
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEAspectToolbar.java

@@ -7,7 +7,7 @@ package org.openzen.zenscript.ide.ui;
 
 import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.MutableLiveList;
 
 /**
  *
@@ -18,7 +18,7 @@ public class IDEAspectToolbar {
 	public final DDrawable icon;
 	public final String title;
 	public final String description;
-	public final LiveList<IDEAspectBarControl> controls = new LiveArrayList<>();
+	public final MutableLiveList<IDEAspectBarControl> controls = new LiveArrayList<>();
 	
 	public IDEAspectToolbar(int order, DDrawable icon, String title, String description) {
 		this.order = order;

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEWindow.java

@@ -5,27 +5,18 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.DAnchor;
-import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.DEmptyView;
-import org.openzen.drawablegui.DIRectangle;
-import org.openzen.drawablegui.DInputField;
-import org.openzen.drawablegui.DUIWindow;
-import org.openzen.drawablegui.form.DForm;
-import org.openzen.drawablegui.form.DFormComponent;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.LivePredicateBool;
-import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.live.SimpleLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveString;
-import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.host.IDETarget;
+import org.openzen.zenscript.ide.ui.dialog.CreatePackageDialog;
+import org.openzen.zenscript.ide.ui.dialog.CreateSourceFileDialog;
 import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
 import org.openzen.zenscript.ide.ui.icons.BuildIcon;
 import org.openzen.zenscript.ide.ui.icons.PlayIcon;
@@ -76,24 +67,12 @@ public class IDEWindow {
 	private void init() {
 		projectToolbar = new IDEAspectToolbar(0, ShadedProjectIcon.PURPLE, "Project", "Project management");
 		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.BLUE, AddBoxIcon.GRAY, addContentDisabled, e -> {
-			DComponent input = new DInputField(DStyleClass.EMPTY, new SimpleLiveString(""), new DDpDimension(100));
-			DForm root = new DForm(DStyleClass.EMPTY, new DFormComponent("Package name:", input));
-			
-			DUIWindow window = e.window;
-			DIRectangle rectangle = window.getWindowBounds();
-			DUIWindow newWindow = e.window.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_LEFT, "Create package", root);
-			
-			newWindow.focus(input);
+			CreatePackageDialog dialog = new CreatePackageDialog(this, contextModule.getValue(), contextPackage.getValue());
+			dialog.open(e.window);
 		}));
 		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.ORANGE, AddBoxIcon.GRAY, addContentDisabled, e -> {
-			DComponent input = new DInputField(DStyleClass.EMPTY, new SimpleLiveString(""), new DDpDimension(100));
-			DForm root = new DForm(DStyleClass.EMPTY, new DFormComponent("Filename:", input));
-			
-			DUIWindow window = e.window;
-			DIRectangle rectangle = window.getWindowBounds();
-			DUIWindow newWindow = e.window.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_LEFT, "Create file", root);
-			
-			newWindow.focus(input);
+			CreateSourceFileDialog dialog = new CreateSourceFileDialog(this, contextModule.getValue(), contextPackage.getValue());
+			dialog.open(e.window);
 		}));
 		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.PURPLE, e -> {
 			
@@ -119,8 +98,8 @@ public class IDEWindow {
 		contextFile.setValue(null);
 	}
 	
-	public void setContextPackage(IDEPackage pkg) {
-		contextModule.setValue(null);
+	public void setContextPackage(IDEModule module, IDEPackage pkg) {
+		contextModule.setValue(module);
 		contextPackage.setValue(pkg);
 		contextFile.setValue(null);
 	}

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreatePackageDialog.java

@@ -0,0 +1,89 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.dialog;
+
+import org.openzen.drawablegui.DAnchor;
+import org.openzen.drawablegui.DButton;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DHorizontalLayout;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DInputField;
+import org.openzen.drawablegui.DLabel;
+import org.openzen.drawablegui.DUIWindow;
+import org.openzen.drawablegui.DVerticalLayout;
+import org.openzen.drawablegui.form.DForm;
+import org.openzen.drawablegui.form.DFormComponent;
+import org.openzen.drawablegui.live.ImmutableLiveBool;
+import org.openzen.drawablegui.live.ImmutableLiveString;
+import org.openzen.drawablegui.live.SimpleLiveString;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.zenscript.ide.host.IDEModule;
+import org.openzen.zenscript.ide.host.IDEPackage;
+import org.openzen.zenscript.ide.ui.IDEWindow;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CreatePackageDialog {
+	private final IDEWindow ideWindow;
+	private final IDEModule module;
+	private final IDEPackage pkg;
+	
+	private final SimpleLiveString name;
+	
+	private final DComponent root;
+	private final DInputField input;
+	
+	private DUIWindow window;
+	
+	public CreatePackageDialog(IDEWindow ideWindow, IDEModule module, IDEPackage pkg) {
+		this.ideWindow = ideWindow;
+		this.module = module;
+		this.pkg = pkg;
+		
+		name = new SimpleLiveString("");
+		input = new DInputField(DStyleClass.EMPTY, name, new DDpDimension(100));
+		input.setOnEnter(this::ok);
+		input.setOnEscape(this::cancel);
+		
+		DForm form = new DForm(
+				DStyleClass.EMPTY,
+				new DFormComponent("Module:", new DLabel(DStyleClass.EMPTY, new ImmutableLiveString(module.getName()))),
+				new DFormComponent("Parent package:", new DLabel(DStyleClass.EMPTY, new ImmutableLiveString(pkg.getName().isEmpty() ? "(module root)" : pkg.getName()))),
+				new DFormComponent("Package name:", input));
+
+		DButton ok = new DButton(DStyleClass.EMPTY, new SimpleLiveString("Create"), ImmutableLiveBool.FALSE, this::ok);
+		DButton cancel = new DButton(DStyleClass.EMPTY, new SimpleLiveString("Cancel"), ImmutableLiveBool.FALSE, this::cancel);
+		DHorizontalLayout buttons = new DHorizontalLayout(
+				DStyleClass.EMPTY,
+				DHorizontalLayout.Alignment.RIGHT,
+				new DHorizontalLayout.Element(cancel, 0, 0, DHorizontalLayout.ElementAlignment.TOP),
+				new DHorizontalLayout.Element(ok, 0, 0, DHorizontalLayout.ElementAlignment.TOP));
+
+		root = new DVerticalLayout(
+				DStyleClass.EMPTY,
+				DVerticalLayout.Alignment.MIDDLE,
+				new DVerticalLayout.Element(form, 1, 1, DVerticalLayout.ElementAlignment.CENTER),
+				new DVerticalLayout.Element(buttons, 0, 0, DVerticalLayout.ElementAlignment.RIGHT));
+	}
+	
+	public void open(DUIWindow parent) {
+		DIRectangle rectangle = parent.getWindowBounds();
+		window = parent.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_LEFT, "Create package", root);
+		window.focus(input);
+	}
+	
+	private void cancel() {
+		window.close();
+	}
+	
+	private void ok() {
+		window.close();
+		pkg.createSubPackage(name.getValue());
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreateSourceFileDialog.java

@@ -0,0 +1,89 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.ui.dialog;
+
+import org.openzen.drawablegui.DAnchor;
+import org.openzen.drawablegui.DButton;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DHorizontalLayout;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DInputField;
+import org.openzen.drawablegui.DLabel;
+import org.openzen.drawablegui.DUIWindow;
+import org.openzen.drawablegui.DVerticalLayout;
+import org.openzen.drawablegui.form.DForm;
+import org.openzen.drawablegui.form.DFormComponent;
+import org.openzen.drawablegui.live.ImmutableLiveBool;
+import org.openzen.drawablegui.live.ImmutableLiveString;
+import org.openzen.drawablegui.live.SimpleLiveString;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.zenscript.ide.host.IDEModule;
+import org.openzen.zenscript.ide.host.IDEPackage;
+import org.openzen.zenscript.ide.ui.IDEWindow;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CreateSourceFileDialog {
+	private final IDEWindow ideWindow;
+	private final IDEModule module;
+	private final IDEPackage pkg;
+	
+	private final SimpleLiveString name;
+	
+	private final DComponent root;
+	private final DInputField input;
+	
+	private DUIWindow window;
+	
+	public CreateSourceFileDialog(IDEWindow ideWindow, IDEModule module, IDEPackage pkg) {
+		this.ideWindow = ideWindow;
+		this.module = module;
+		this.pkg = pkg;
+		
+		name = new SimpleLiveString("");
+		input = new DInputField(DStyleClass.EMPTY, name, new DDpDimension(100));
+		input.setOnEnter(this::ok);
+		input.setOnEscape(this::cancel);
+		
+		DForm form = new DForm(
+				DStyleClass.EMPTY,
+				new DFormComponent("Module:", new DLabel(DStyleClass.EMPTY, new ImmutableLiveString(module.getName()))),
+				new DFormComponent("Package:", new DLabel(DStyleClass.EMPTY, new ImmutableLiveString(pkg.getName().isEmpty() ? "(module root)" : pkg.getName()))),
+				new DFormComponent("Filename:", input));
+
+		DButton ok = new DButton(DStyleClass.EMPTY, new SimpleLiveString("Create"), ImmutableLiveBool.FALSE, this::ok);
+		DButton cancel = new DButton(DStyleClass.EMPTY, new SimpleLiveString("Cancel"), ImmutableLiveBool.FALSE, this::cancel);
+		DHorizontalLayout buttons = new DHorizontalLayout(
+				DStyleClass.EMPTY,
+				DHorizontalLayout.Alignment.RIGHT,
+				new DHorizontalLayout.Element(cancel, 0, 0, DHorizontalLayout.ElementAlignment.TOP),
+				new DHorizontalLayout.Element(ok, 0, 0, DHorizontalLayout.ElementAlignment.TOP));
+
+		root = new DVerticalLayout(
+				DStyleClass.EMPTY,
+				DVerticalLayout.Alignment.MIDDLE,
+				new DVerticalLayout.Element(form, 1, 1, DVerticalLayout.ElementAlignment.CENTER),
+				new DVerticalLayout.Element(buttons, 0, 0, DVerticalLayout.ElementAlignment.RIGHT));
+	}
+	
+	public void open(DUIWindow parent) {
+		DIRectangle rectangle = parent.getWindowBounds();
+		window = parent.getContext().openDialog(rectangle.getCenterX(), rectangle.getCenterY(), DAnchor.MIDDLE_LEFT, "Create source file", root);
+		window.focus(input);
+	}
+	
+	private void cancel() {
+		window.close();
+	}
+	
+	private void ok() {
+		window.close();
+		pkg.createSourceFile(name.getValue() + ".zs");
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedView.java

@@ -19,6 +19,7 @@ import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.MutableLiveList;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
@@ -29,7 +30,7 @@ import org.openzen.drawablegui.style.DStylePath;
  */
 public class TabbedView extends BaseComponentGroup {
 	private final DStyleClass styleClass;
-	public final LiveList<TabbedViewComponent> tabs = new LiveArrayList<>();
+	public final MutableLiveList<TabbedViewComponent> tabs = new LiveArrayList<>();
 	private final LiveObject<DDimensionPreferences> preferences = new ImmutableLiveObject<>(DDimensionPreferences.EMPTY);
 	public final LiveObject<TabbedViewComponent> currentTab = new SimpleLiveObject<>(null);
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/LibraryTreeNode.java

@@ -26,6 +26,11 @@ public class LibraryTreeNode extends ProjectOverviewNode {
 		modules = new LiveMappedList<>(library.getModules(), module -> new ModuleTreeNode(window, module));
 	}
 	
+	@Override
+	public void close() {
+		modules.close();
+	}
+	
 	@Override
 	public DColorableIcon getIcon() {
 		return LibraryIcon.INSTANCE;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ModuleTreeNode.java

@@ -16,14 +16,10 @@ import org.openzen.zenscript.ide.ui.icons.ModuleIcon;
  * @author Hoofdgebruiker
  */
 public class ModuleTreeNode extends PackageTreeNode {
-	private final IDEModule module;
-	private final IDEWindow window;
-	
 	public ModuleTreeNode(IDEWindow window, IDEModule module) {
 		super(window, module.getRootPackage());
 		
-		this.module = module;
-		this.window = window;
+		init(module);
 	}
 
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/PackageTreeNode.java

@@ -6,9 +6,11 @@
 package org.openzen.zenscript.ide.ui.view.project;
 
 import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.live.LiveConcatList;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
+import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.icons.FolderIcon;
@@ -18,17 +20,36 @@ import org.openzen.zenscript.ide.ui.icons.FolderIcon;
  * @author Hoofdgebruiker
  */
 public class PackageTreeNode extends ProjectOverviewNode {
+	protected final IDEWindow window;
+	protected IDEModule module;
 	private final IDEPackage pkg;
-	private final LiveList<ProjectOverviewNode> contents;
+	private LiveList<ProjectOverviewNode> contents;
 	
 	public PackageTreeNode(IDEWindow window, IDEPackage pkg) {
+		this.window = window;
+		this.pkg = pkg;
+	}
+	
+	public PackageTreeNode(IDEWindow window, IDEModule module, IDEPackage pkg) {
+		this.window = window;
+		this.module = module;
 		this.pkg = pkg;
 		
+		init(module);
+	}
+	
+	protected final void init(IDEModule module) {
+		this.module = module;
 		contents = new LiveConcatList<>(
-				new LiveMappedList<>(pkg.getSubPackages(), sub -> new PackageTreeNode(window, sub)),
+				new LiveMappedList<>(pkg.getSubPackages(), sub -> new PackageTreeNode(window, module, sub)),
 				new LiveMappedList<>(pkg.getSourceFiles(), source -> new SourceFileTreeNode(window, source))
 		);
 	}
+	
+	@Override
+	public void close() {
+		contents.close();
+	}
 
 	@Override
 	public LiveList<ProjectOverviewNode> getChildren() {
@@ -54,4 +75,9 @@ public class PackageTreeNode extends ProjectOverviewNode {
 	public boolean isLeaf() {
 		return false;
 	}
+	
+	@Override
+	public void onMouseClick(DMouseEvent e) {
+		window.setContextPackage(module, pkg);
+	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectOverviewNode.java

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
-import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.MutableLiveBool;
 import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.tree.DTreeNode;
 
@@ -14,12 +14,12 @@ import org.openzen.drawablegui.tree.DTreeNode;
  * @author Hoofdgebruiker
  */
 public abstract class ProjectOverviewNode implements DTreeNode<ProjectOverviewNode> {
-	private final LiveBool collapsed = new SimpleLiveBool();
+	private final MutableLiveBool collapsed = new SimpleLiveBool();
 	
 	public abstract Kind getKind();
 	
 	@Override
-	public LiveBool isCollapsed() {
+	public MutableLiveBool isCollapsed() {
 		return collapsed;
 	}
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectTreeNode.java

@@ -29,6 +29,11 @@ public class ProjectTreeNode extends ProjectOverviewNode {
 		modules = new LiveMappedList<>(host.getModules(), module -> new ModuleTreeNode(window, module));
 	}
 	
+	@Override
+	public void close(){
+		modules.close();
+	}
+	
 	@Override
 	public DColorableIcon getIcon() {
 		return ProjectIcon.INSTANCE;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/RootTreeNode.java

@@ -29,6 +29,11 @@ public class RootTreeNode extends ProjectOverviewNode {
 				new LiveMappedList<>(host.getLibraries(), library -> new LibraryTreeNode(window, library)));
 	}
 	
+	@Override
+	public void close() {
+		children.close();
+	}
+	
 	@Override
 	public DColorableIcon getIcon() {
 		return ProjectIcon.INSTANCE;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/SourceFileTreeNode.java

@@ -25,6 +25,11 @@ public class SourceFileTreeNode extends ProjectOverviewNode {
 		this.window = window;
 		this.sourceFile = sourceFile;
 	}
+	
+	@Override
+	public void close() {
+		
+	}
 
 	@Override
 	public Kind getKind() {