Mercurial > fife-parpg

changeset 179:28532ae6f9f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved all editor content out of content, as chewie says it's deprecated as hell ;-)
author cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 30 Jan 2009 00:54:07 +0000
parents 7dc59bd3d6b1
children 66bd7f8c541e
files clients/editor/content/fonts/samanata.fontdef clients/editor/content/fonts/samanata.ttf clients/editor/content/gui/cameraedit.xml clients/editor/content/gui/eleveditor.xml clients/editor/content/gui/filebrowser.xml clients/editor/content/gui/help.xml clients/editor/content/gui/input.xml clients/editor/content/gui/mapeditor.xml clients/editor/content/gui/offsetedit.xml clients/editor/content/gui/rootpanel.xml clients/editor/content/gui/selection.xml clients/editor/content/gui/statuspanel.xml clients/editor/content/gui/tools.xml clients/editor/content/icons/add_instance.png clients/editor/content/icons/add_layer.png clients/editor/content/icons/delete_layer.png clients/editor/content/icons/eraser.png clients/editor/content/icons/hand.png clients/editor/content/icons/help.png clients/editor/content/icons/load_map.png clients/editor/content/icons/map_wizard.png clients/editor/content/icons/new_map.png clients/editor/content/icons/quit.png clients/editor/content/icons/save_map.png clients/editor/content/icons/select_layer.png clients/editor/content/icons/take_screenshot.png clients/editor/content/icons/zoom_default.png clients/editor/content/icons/zoom_in.png clients/editor/content/icons/zoom_out.png clients/editor/content/infotext.txt clients/editor/fifedit.py clients/editor/fonts/samanata.fontdef clients/editor/fonts/samanata.ttf clients/editor/gui/cameraedit.xml clients/editor/gui/eleveditor.xml clients/editor/gui/filebrowser.xml clients/editor/gui/help.xml clients/editor/gui/input.xml clients/editor/gui/mapeditor.xml clients/editor/gui/offsetedit.xml clients/editor/gui/rootpanel.xml clients/editor/gui/selection.xml clients/editor/gui/statuspanel.xml clients/editor/gui/tools.xml clients/editor/icons/add_instance.png clients/editor/icons/add_layer.png clients/editor/icons/delete_layer.png clients/editor/icons/eraser.png clients/editor/icons/hand.png clients/editor/icons/help.png clients/editor/icons/load_map.png clients/editor/icons/map_wizard.png clients/editor/icons/new_map.png clients/editor/icons/quit.png clients/editor/icons/save_map.png clients/editor/icons/select_layer.png clients/editor/icons/take_screenshot.png clients/editor/icons/zoom_default.png clients/editor/icons/zoom_in.png clients/editor/icons/zoom_out.png clients/editor/input.py clients/editor/listener.py clients/editor/misc/infotext.txt clients/editor/plugins/mapeditor.py clients/editor/plugins/mapwizard.py clients/editor/plugins/objectedit.py clients/editor/run.py clients/editor/selection.py clients/editor/settings.py engine/extensions/filebrowser.py
diffstat 70 files changed, 259 insertions(+), 259 deletions(-) [+]
line wrap: on
line diff
--- a/clients/editor/content/fonts/samanata.fontdef	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-[Font/samanata_large]
-
-type: truetype
-source: content/fonts/samanata.ttf
-size: 30
-
-antialias: 0
-
-color: 255,255,0
-
-[Font/samanata_small]
-
-type: truetype
-source: content/fonts/samanata.ttf
-size: 8
-
-antialias: 0
-row_spacing: 50
-glyph_spacing: 50
Binary file clients/editor/content/fonts/samanata.ttf has changed
--- a/clients/editor/content/gui/cameraedit.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<Window title="Camera Editor">
-	<VBox>
-		<HBox>
-			<Label name="idLabel" text="Camera ID:"/>
-			<TextField name="idBox" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="mapLabel" text="Camera Map ID:"/>
-      <TextField name="mapBox" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="layerLabel" text="Camera Layer ID:"/>
-      <TextField name="layerBox" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="viewLabel" text="Viewport ('x,y,w,h'):"/>
-		  <TextField name="viewBox" text="0,0,640,480" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="refhLabel" text="Reference cell height:"/>
-			<TextField name="refhBox" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="refwLabel" text="Reference cell width:"/>
-			<TextField name="refwBox" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="rotLabel" text="Rotation:"/>
-			<TextField name="rotBox" text="0" min_size="50,10"/>
-		</HBox>
-		<HBox>
-			<Label name="tiltLabel" text="Tilt:"/>
-			<TextField name="tiltBox" text="0" min_size="50,10"/>
-		</HBox>
-	</VBox>
-	<HBox>
-		<Button name="okButton" text="OK"/>
-		<Button name="cancelButton" text="Cancel"/>
-	</HBox>
-</Window>
--- a/clients/editor/content/gui/eleveditor.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<Window title="Elevation Editor">
-	<HBox>
-		<VBox name="Metadata Properties">
-		</VBox>
-		<VBox>
-			<Button name="layerButton" text="Edit Layer"/>
-			<Spacer /> 		
-			<Button name="closeButton" text="Close"/>
-		</VBox>
-	</HBox>
-</Window>
--- a/clients/editor/content/gui/filebrowser.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<Window title="File Browser">
-	<HBox>
-		<VBox>
-			<Label name="dirLabel" text="Directories:"/>
-			<ScrollArea size="200,300">
-				<ListBox name="dirList"/>
-			</ScrollArea>
-		</VBox>
-		<VBox name="fileColumn">
-			<Label name="fileLabel" text="Files:"/>
-			<ScrollArea size="200,300">
-				<ListBox name="fileList"/>
-			</ScrollArea>
-		</VBox>
-		<VBox>
-			<Button name="selectButton" text="Select"/>
-			<Spacer />
-			<Button name="closeButton" text="Close"/>
-		</VBox>
-	</HBox>
-</Window>
--- a/clients/editor/content/gui/help.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<Window title="Help">
-	<TextBox name="helpText"/>
-	<Button name="closeButton" text="Close"/>
-</Window>
--- a/clients/editor/content/gui/input.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<Window name="Input" title="Input box:">
-	<VBox>
-		<Label name="prompt" text="Enter your data:"/>
-		<TextField name="inputBox"/>	
-		<HBox>
-			<Button name="okButton" text="OK"/>
-			<Button name="cancelButton" text="Cancel"/>
-		</HBox>
-	</VBox>
-</Window>
--- a/clients/editor/content/gui/mapeditor.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<Window title="Map Editor">
-	<HBox>
-		<VBox name="Properties">
-		</VBox>
-		<VBox>
-			<Button name="layerButton" text="Edit Layer"/>
-			<Button name="objButton" text="View Objects"/>
-			<Spacer /> 		
-			<Button name="closeButton" text="Close"/>
-		</VBox>
-	</HBox>
-</Window>
--- a/clients/editor/content/gui/offsetedit.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<Window title="Object editor" position="10,700"> <!-- size="200,250" min_size="200,250" max_size="200,250" > -->
-
-	<Label text="Namespace:" min_size="85,20"/>
-	<TextBox text="None" name="object_namespace" min_size="30,20"/>
-
-	<HBox>	 
-		<Label text="Object ID:" min_size="85,20"/>
-		<TextBox text="None" name="object_id" min_size="30,20"/>
-	</HBox>
-	<HBox>
-		<Label text="Blocking:" min_size="45,20"/>
-		<TextBox text="0" name="object_blocking" min_size="20,20"/>
-
-		<Label text="Static:" min_size="45,20"/>
-		<TextBox text="0" name="object_static" min_size="20,20"/>
-	</HBox>
-
-
-	<HBox>	 
-		<Label text="Select Rotation:" min_size="85,20" />
-	</HBox>
-	
-	<DropDown min_size="80,0" name="select_rotations"/>
-
-	<VBox>
-		<HBox>
-			<TextBox text="0" name="x_offset" size="30,20" min_size="30,20" max_size="30,20" />
-			<Button name="x_offset_up" text="+" max_size="20,20"/>
-			<Button name="x_offset_dn" text="-" max_size="20,20"/>
-		</HBox>
-
-		<HBox>
-			<TextBox text="0" name="y_offset" size="30,20" min_size="30,20" max_size="30,20"/>
-			<Button name="y_offset_up" text="+" max_size="20,20"/>
-			<Button name="y_offset_dn" text="-" max_size="20,20"/>
-		</HBox>
-	</VBox>
-
-	<Label text="Selected Instance" min_size="85,20" />
-	
-	<HBox >	 
-		<Label text="Instance ID:" min_size="85,20"/>
-		<TextBox text="None" name="instance_id" min_size="30,20"/>
-	</HBox>
-	<HBox >	 
-		<Label text="Instance rot:" min_size="85,20"/>
-		<TextBox text="0" name="instance_rotation" min_size="30,20"/>
-	</HBox>
-
-
-
-	<VBox name="animation_panel_wrapper" max_size="150,50">
-		<Spacer />
-		<VBox name="animation_panel">
-			<Label text="Animation panel" min_size="85,20" />
-			<HBox>
-				<Button name="anim_start_pos" text="S" max_size="20,20"/>
-				<Button name="anim_left" text="l1" max_size="20,20"/>
-				<TextBox name="anim_current_frame" text="0" min_size="30,20"/>
-				<Button name="anim_right" text="r1" max_size="20,20"/>
-				<Button name="anim_end_pos" text="E" max_size="20,20"/>
-			</HBox>
-		</VBox>
-	</VBox>
-
-	<HBox>
-		<Button name="use_data" text="Use"/>
-		<Button name="previous_data" text="Previous"/>
-		<Button name="default_data" text="Default"/>
-	</HBox>
-	<Spacer />
-	<Button name="change_data" text="Save object"/>
-
-</Window>
--- a/clients/editor/content/gui/rootpanel.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<HBox opaque='1'>
-	<Button name="quitButton" text="Quit"/>
-</HBox>
--- a/clients/editor/content/gui/selection.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<Window title="Select an option">
-	<VBox>
-		<ScrollArea size="150,300">
-			<ListBox name="optionDrop"/>	
-		</ScrollArea>
-		<HBox>
-			<Button name="okButton" text="OK"/>
-			<Button name="cancelButton" text="Cancel"/>
-		</HBox>
-	</VBox>
-</Window>
--- a/clients/editor/content/gui/statuspanel.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<HBox opaque='1'>
-	<Label name="lblStatus" text="" />
-</HBox>
--- a/clients/editor/content/gui/tools.xml	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<Window title="" titlebar_height="15" margins="0,0">
-	<VBox padding="0">
-		<ToggleButton group="toolbuttons" hover_image="content/icons/hand.png" up_image="content/icons/hand.png" down_image="content/icons/hand.png" name="btnSelect" offset="1,1" helptext="Select cells on layer" />
-		<ToggleButton group="toolbuttons" hover_image="content/icons/select_layer.png" up_image="content/icons/select_layer.png" down_image="content/icons/select_layer.png" name="btnMove" offset="1,1" helptext="Moves instances" />
-		<ToggleButton group="toolbuttons" hover_image="content/icons/add_instance.png" up_image="content/icons/add_instance.png" down_image="content/icons/add_instance.png" name="btnInsert" offset="1,1" helptext="Adds new instances based on currently selected object" />
-		<ToggleButton group="toolbuttons" hover_image="content/icons/quit.png" up_image="content/icons/quit.png" down_image="content/icons/quit.png" name="btnDelete" offset="1,1" helptext="Deletes instances" />
-	</VBox>
-</Window>
Binary file clients/editor/content/icons/add_instance.png has changed
Binary file clients/editor/content/icons/add_layer.png has changed
Binary file clients/editor/content/icons/delete_layer.png has changed
Binary file clients/editor/content/icons/eraser.png has changed
Binary file clients/editor/content/icons/hand.png has changed
Binary file clients/editor/content/icons/help.png has changed
Binary file clients/editor/content/icons/load_map.png has changed
Binary file clients/editor/content/icons/map_wizard.png has changed
Binary file clients/editor/content/icons/new_map.png has changed
Binary file clients/editor/content/icons/quit.png has changed
Binary file clients/editor/content/icons/save_map.png has changed
Binary file clients/editor/content/icons/select_layer.png has changed
Binary file clients/editor/content/icons/take_screenshot.png has changed
Binary file clients/editor/content/icons/zoom_default.png has changed
Binary file clients/editor/content/icons/zoom_in.png has changed
Binary file clients/editor/content/icons/zoom_out.png has changed
--- a/clients/editor/content/infotext.txt	Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-This is the standalone FIFE editor, release 2008.1
-
-Keybindings:
---------------
-- P = Make screenshot
-- LEFT = Move camera left
-- RIGHT = Move camera right
-- UP = Move camera up
-- DOWN = Move camera down
-- F10 = Toggle console on / off
-- ESC = Quit techdemo
-
-- INS = Makes a new instance on the map with
-        current object selection at current
-        mouse selection (toggle).
-- DEL = Removes instances at current mouse
-        selection (toggle).
-- R   = Rotates selected instace (if object
-        contains rotated images)
-- M   = Moves selected instace (drag it around)
-- T   = shows / hides grid
-- B   = shows / hides blocking info
-- U   = Undo an instance placement or removal
-- CTRL = Enters pan/zoom mode. Pan with LMB drag,
-         zoom with mouse wheel while CTRL is
-         pressed
-
-
-http://www.fifengine.de
--- a/clients/editor/fifedit.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/fifedit.py	Fri Jan 30 00:54:07 2009 +0000
@@ -11,7 +11,7 @@
 	"""
 	def __init__(self, engine):
 		pychan.init(engine,debug=False)
-		self.gui = pychan.loadXML('content/gui/rootpanel.xml')
+		self.gui = pychan.loadXML('gui/rootpanel.xml')
 		eventMap = {
 			'quitButton'  : self.quit
 		}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/fonts/samanata.fontdef	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,19 @@
+[Font/samanata_large]
+
+type: truetype
+source: content/fonts/samanata.ttf
+size: 30
+
+antialias: 0
+
+color: 255,255,0
+
+[Font/samanata_small]
+
+type: truetype
+source: content/fonts/samanata.ttf
+size: 8
+
+antialias: 0
+row_spacing: 50
+glyph_spacing: 50
Binary file clients/editor/fonts/samanata.ttf has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/cameraedit.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,40 @@
+<Window title="Camera Editor">
+	<VBox>
+		<HBox>
+			<Label name="idLabel" text="Camera ID:"/>
+			<TextField name="idBox" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="mapLabel" text="Camera Map ID:"/>
+      <TextField name="mapBox" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="layerLabel" text="Camera Layer ID:"/>
+      <TextField name="layerBox" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="viewLabel" text="Viewport ('x,y,w,h'):"/>
+		  <TextField name="viewBox" text="0,0,640,480" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="refhLabel" text="Reference cell height:"/>
+			<TextField name="refhBox" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="refwLabel" text="Reference cell width:"/>
+			<TextField name="refwBox" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="rotLabel" text="Rotation:"/>
+			<TextField name="rotBox" text="0" min_size="50,10"/>
+		</HBox>
+		<HBox>
+			<Label name="tiltLabel" text="Tilt:"/>
+			<TextField name="tiltBox" text="0" min_size="50,10"/>
+		</HBox>
+	</VBox>
+	<HBox>
+		<Button name="okButton" text="OK"/>
+		<Button name="cancelButton" text="Cancel"/>
+	</HBox>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/eleveditor.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,11 @@
+<Window title="Elevation Editor">
+	<HBox>
+		<VBox name="Metadata Properties">
+		</VBox>
+		<VBox>
+			<Button name="layerButton" text="Edit Layer"/>
+			<Spacer /> 		
+			<Button name="closeButton" text="Close"/>
+		</VBox>
+	</HBox>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/filebrowser.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,21 @@
+<Window title="File Browser">
+	<HBox>
+		<VBox>
+			<Label name="dirLabel" text="Directories:"/>
+			<ScrollArea size="200,300">
+				<ListBox name="dirList"/>
+			</ScrollArea>
+		</VBox>
+		<VBox name="fileColumn">
+			<Label name="fileLabel" text="Files:"/>
+			<ScrollArea size="200,300">
+				<ListBox name="fileList"/>
+			</ScrollArea>
+		</VBox>
+		<VBox>
+			<Button name="selectButton" text="Select"/>
+			<Spacer />
+			<Button name="closeButton" text="Close"/>
+		</VBox>
+	</HBox>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/help.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,4 @@
+<Window title="Help">
+	<TextBox name="helpText"/>
+	<Button name="closeButton" text="Close"/>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/input.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,10 @@
+<Window name="Input" title="Input box:">
+	<VBox>
+		<Label name="prompt" text="Enter your data:"/>
+		<TextField name="inputBox"/>	
+		<HBox>
+			<Button name="okButton" text="OK"/>
+			<Button name="cancelButton" text="Cancel"/>
+		</HBox>
+	</VBox>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/mapeditor.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,12 @@
+<Window title="Map Editor">
+	<HBox>
+		<VBox name="Properties">
+		</VBox>
+		<VBox>
+			<Button name="layerButton" text="Edit Layer"/>
+			<Button name="objButton" text="View Objects"/>
+			<Spacer /> 		
+			<Button name="closeButton" text="Close"/>
+		</VBox>
+	</HBox>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/offsetedit.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,74 @@
+<Window title="Object editor" position="10,700"> <!-- size="200,250" min_size="200,250" max_size="200,250" > -->
+
+	<Label text="Namespace:" min_size="85,20"/>
+	<TextBox text="None" name="object_namespace" min_size="30,20"/>
+
+	<HBox>	 
+		<Label text="Object ID:" min_size="85,20"/>
+		<TextBox text="None" name="object_id" min_size="30,20"/>
+	</HBox>
+	<HBox>
+		<Label text="Blocking:" min_size="45,20"/>
+		<TextBox text="0" name="object_blocking" min_size="20,20"/>
+
+		<Label text="Static:" min_size="45,20"/>
+		<TextBox text="0" name="object_static" min_size="20,20"/>
+	</HBox>
+
+
+	<HBox>	 
+		<Label text="Select Rotation:" min_size="85,20" />
+	</HBox>
+	
+	<DropDown min_size="80,0" name="select_rotations"/>
+
+	<VBox>
+		<HBox>
+			<TextBox text="0" name="x_offset" size="30,20" min_size="30,20" max_size="30,20" />
+			<Button name="x_offset_up" text="+" max_size="20,20"/>
+			<Button name="x_offset_dn" text="-" max_size="20,20"/>
+		</HBox>
+
+		<HBox>
+			<TextBox text="0" name="y_offset" size="30,20" min_size="30,20" max_size="30,20"/>
+			<Button name="y_offset_up" text="+" max_size="20,20"/>
+			<Button name="y_offset_dn" text="-" max_size="20,20"/>
+		</HBox>
+	</VBox>
+
+	<Label text="Selected Instance" min_size="85,20" />
+	
+	<HBox >	 
+		<Label text="Instance ID:" min_size="85,20"/>
+		<TextBox text="None" name="instance_id" min_size="30,20"/>
+	</HBox>
+	<HBox >	 
+		<Label text="Instance rot:" min_size="85,20"/>
+		<TextBox text="0" name="instance_rotation" min_size="30,20"/>
+	</HBox>
+
+
+
+	<VBox name="animation_panel_wrapper" max_size="150,50">
+		<Spacer />
+		<VBox name="animation_panel">
+			<Label text="Animation panel" min_size="85,20" />
+			<HBox>
+				<Button name="anim_start_pos" text="S" max_size="20,20"/>
+				<Button name="anim_left" text="l1" max_size="20,20"/>
+				<TextBox name="anim_current_frame" text="0" min_size="30,20"/>
+				<Button name="anim_right" text="r1" max_size="20,20"/>
+				<Button name="anim_end_pos" text="E" max_size="20,20"/>
+			</HBox>
+		</VBox>
+	</VBox>
+
+	<HBox>
+		<Button name="use_data" text="Use"/>
+		<Button name="previous_data" text="Previous"/>
+		<Button name="default_data" text="Default"/>
+	</HBox>
+	<Spacer />
+	<Button name="change_data" text="Save object"/>
+
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/rootpanel.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,3 @@
+<HBox opaque='1'>
+	<Button name="quitButton" text="Quit"/>
+</HBox>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/selection.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,11 @@
+<Window title="Select an option">
+	<VBox>
+		<ScrollArea size="150,300">
+			<ListBox name="optionDrop"/>	
+		</ScrollArea>
+		<HBox>
+			<Button name="okButton" text="OK"/>
+			<Button name="cancelButton" text="Cancel"/>
+		</HBox>
+	</VBox>
+</Window>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/statuspanel.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,3 @@
+<HBox opaque='1'>
+	<Label name="lblStatus" text="" />
+</HBox>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/tools.xml	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,8 @@
+<Window title="" titlebar_height="15" margins="0,0">
+	<VBox padding="0">
+		<ToggleButton group="toolbuttons" hover_image="icons/hand.png" up_image="icons/hand.png" down_image="icons/hand.png" name="btnSelect" offset="1,1" helptext="Select cells on layer" />
+		<ToggleButton group="toolbuttons" hover_image="icons/select_layer.png" up_image="icons/select_layer.png" down_image="icons/select_layer.png" name="btnMove" offset="1,1" helptext="Moves instances" />
+		<ToggleButton group="toolbuttons" hover_image="icons/add_instance.png" up_image="icons/add_instance.png" down_image="icons/add_instance.png" name="btnInsert" offset="1,1" helptext="Adds new instances based on currently selected object" />
+		<ToggleButton group="toolbuttons" hover_image="icons/quit.png" up_image="icons/quit.png" down_image="icons/quit.png" name="btnDelete" offset="1,1" helptext="Deletes instances" />
+	</VBox>
+</Window>
Binary file clients/editor/icons/add_instance.png has changed
Binary file clients/editor/icons/add_layer.png has changed
Binary file clients/editor/icons/delete_layer.png has changed
Binary file clients/editor/icons/eraser.png has changed
Binary file clients/editor/icons/hand.png has changed
Binary file clients/editor/icons/help.png has changed
Binary file clients/editor/icons/load_map.png has changed
Binary file clients/editor/icons/map_wizard.png has changed
Binary file clients/editor/icons/new_map.png has changed
Binary file clients/editor/icons/quit.png has changed
Binary file clients/editor/icons/save_map.png has changed
Binary file clients/editor/icons/select_layer.png has changed
Binary file clients/editor/icons/take_screenshot.png has changed
Binary file clients/editor/icons/zoom_default.png has changed
Binary file clients/editor/icons/zoom_in.png has changed
Binary file clients/editor/icons/zoom_out.png has changed
--- a/clients/editor/input.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/input.py	Fri Jan 30 00:54:07 2009 +0000
@@ -9,7 +9,7 @@
 	def __init__(self, prompt, onEntry):
 		self._callback = onEntry
 
-		self._widget = pychan.loadXML('content/gui/input.xml')
+		self._widget = pychan.loadXML('gui/input.xml')
 
 		self._widget.mapEvents({
 			'okButton'     : self._complete,
--- a/clients/editor/listener.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/listener.py	Fri Jan 30 00:54:07 2009 +0000
@@ -84,7 +84,7 @@
 			self.app.quit()
 
 		if command.lower() in ( 'help', 'help()' ):
-			self.engine.getGuiManager().getConsole().println( open( 'content/infotext.txt', 'r' ).read() )
+			self.engine.getGuiManager().getConsole().println( open( 'misc/infotext.txt', 'r' ).read() )
 			return "-- End of help --"
 		
 		try:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/misc/infotext.txt	Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,29 @@
+This is the standalone FIFE editor, release 2008.1
+
+Keybindings:
+--------------
+- P = Make screenshot
+- LEFT = Move camera left
+- RIGHT = Move camera right
+- UP = Move camera up
+- DOWN = Move camera down
+- F10 = Toggle console on / off
+- ESC = Quit techdemo
+
+- INS = Makes a new instance on the map with
+        current object selection at current
+        mouse selection (toggle).
+- DEL = Removes instances at current mouse
+        selection (toggle).
+- R   = Rotates selected instace (if object
+        contains rotated images)
+- M   = Moves selected instace (drag it around)
+- T   = shows / hides grid
+- B   = shows / hides blocking info
+- U   = Undo an instance placement or removal
+- CTRL = Enters pan/zoom mode. Pan with LMB drag,
+         zoom with mouse wheel while CTRL is
+         pressed
+
+
+http://www.fifengine.de
--- a/clients/editor/plugins/mapeditor.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/plugins/mapeditor.py	Fri Jan 30 00:54:07 2009 +0000
@@ -32,7 +32,7 @@
 
 	def show(self, map):
 		if not self._mapedit:
-			self._mapedit = pychan.loadXML('content/gui/mapeditor.xml')
+			self._mapedit = pychan.loadXML('gui/mapeditor.xml')
 			self._mapedit.mapEvents({
 				'layerButton'  : self._onLayerSelect,
 				'objButton'   : self._onObjectSelect,
@@ -63,7 +63,7 @@
 	
 	def show(self):
 		if not self._toolbar:
-			self._toolbar = pychan.loadXML('content/gui/tools.xml')
+			self._toolbar = pychan.loadXML('gui/tools.xml')
 			evtmap = {
 				'btnSelect' : self._onSelect,
 				'btnMove' : self._onMove,
@@ -107,7 +107,7 @@
 	
 class StatusBar(object):
 	def __init__(self, screenw, screenh):
-		self._statusbar = pychan.loadXML('content/gui/statuspanel.xml')
+		self._statusbar = pychan.loadXML('gui/statuspanel.xml')
 		self._statusbar.show()
 		height = 25
 		self._statusbar.position = (0, screenh - height)
--- a/clients/editor/plugins/mapwizard.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/plugins/mapwizard.py	Fri Jan 30 00:54:07 2009 +0000
@@ -17,7 +17,7 @@
 	def __init__(self, engine, callback=None, map=None, layer=None):
 		self.engine = engine
 		self.callback = callback
-		self._widget = pychan.loadXML('content/gui/cameraedit.xml')
+		self._widget = pychan.loadXML('gui/cameraedit.xml')
 
 		if map:
 			self._widget.distributeData({
--- a/clients/editor/plugins/objectedit.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/plugins/objectedit.py	Fri Jan 30 00:54:07 2009 +0000
@@ -115,7 +115,7 @@
 			- creates the gui skeleton by loading the xml file
 			- finds some important childs and saves their widget in the object
 		"""
-		self.container = pychan.loadXML('content/gui/offsetedit.xml')
+		self.container = pychan.loadXML('gui/offsetedit.xml')
 		self.container.mapEvents({
 			'x_offset_up' 	: cbwa(self.change_offset_x, 1),
 			'x_offset_dn' 	: cbwa(self.change_offset_x, -1),
--- a/clients/editor/run.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/run.py	Fri Jan 30 00:54:07 2009 +0000
@@ -42,9 +42,9 @@
 		if self._helpWidget:
 			self._helpWidget.show()
 			return
-		self._helpWidget = pychan.loadXML('content/gui/help.xml')
+		self._helpWidget = pychan.loadXML('gui/help.xml')
 		self._helpWidget.mapEvents({ 'closeButton' : self._helpWidget.hide })
-		self._helpWidget.distributeData({ 'helpText' : open("content/infotext.txt").read() })
+		self._helpWidget.distributeData({ 'helpText' : open("misc/infotext.txt").read() })
 		self._helpWidget.show()
 
 class Editor(basicapplication.ApplicationBase):
--- a/clients/editor/selection.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/selection.py	Fri Jan 30 00:54:07 2009 +0000
@@ -11,7 +11,7 @@
 		self.list = list
 		self._callback = onSelection
 
-		self._widget = pychan.loadXML('content/gui/selection.xml')
+		self._widget = pychan.loadXML('gui/selection.xml')
 
 		self._widget.mapEvents({
 			'okButton'     : self._selected,
@@ -40,7 +40,7 @@
 		self.list = list
 		self._callback = onSelection
 
-		self._widget = pychan.loadXML('content/gui/selection.xml')
+		self._widget = pychan.loadXML('gui/selection.xml')
 
 		self._widget.mapEvents({
 			'okButton'     : self._widget.hide,
--- a/clients/editor/settings.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/settings.py	Fri Jan 30 00:54:07 2009 +0000
@@ -7,7 +7,7 @@
 ScreenWidth         = 1024
 ScreenHeight        = 768
 
-Font                = 'content/fonts/samanata.ttf'
+Font                = 'fonts/samanata.ttf'
 FontGlyphs          = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\""
 
 LogModules          = ['controller']
--- a/engine/extensions/filebrowser.py	Fri Jan 30 00:24:50 2009 +0000
+++ b/engine/extensions/filebrowser.py	Fri Jan 30 00:54:07 2009 +0000
@@ -12,7 +12,7 @@
 	The savefile option provides a box for supplying a new filename that doesn't exist yet.
   The selectdir option allows directories to be selected as well as files.
 	"""
-	def __init__(self, engine, fileSelected, savefile=False, selectdir=False, extensions=('xml',), guixmlpath="content/gui/filebrowser.xml"):
+	def __init__(self, engine, fileSelected, savefile=False, selectdir=False, extensions=('xml',), guixmlpath="gui/filebrowser.xml"):
 		self.engine = engine
 		self.fileSelected = fileSelected