# HG changeset patch
# User cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1233275090 0
# Node ID 7dc59bd3d6b1344f2723ec22be03c7acab8cfabc
# Parent  3fb17daa1b274c5af2efe67a6214bb593acc1c9a
Small cleanup in editor directory:
 * Moved icons/ and gui/offsetedit.xml into content directory.

diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/gui/offsetedit.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/content/gui/offsetedit.xml	Fri Jan 30 00:24:50 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>
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/gui/tools.xml
--- a/clients/editor/content/gui/tools.xml	Sun Jan 25 20:17:41 2009 +0000
+++ b/clients/editor/content/gui/tools.xml	Fri Jan 30 00:24:50 2009 +0000
@@ -1,8 +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" />
+		<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>
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/add_instance.png
Binary file clients/editor/content/icons/add_instance.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/add_layer.png
Binary file clients/editor/content/icons/add_layer.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/delete_layer.png
Binary file clients/editor/content/icons/delete_layer.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/eraser.png
Binary file clients/editor/content/icons/eraser.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/hand.png
Binary file clients/editor/content/icons/hand.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/help.png
Binary file clients/editor/content/icons/help.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/load_map.png
Binary file clients/editor/content/icons/load_map.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/map_wizard.png
Binary file clients/editor/content/icons/map_wizard.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/new_map.png
Binary file clients/editor/content/icons/new_map.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/quit.png
Binary file clients/editor/content/icons/quit.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/save_map.png
Binary file clients/editor/content/icons/save_map.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/select_layer.png
Binary file clients/editor/content/icons/select_layer.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/take_screenshot.png
Binary file clients/editor/content/icons/take_screenshot.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/zoom_default.png
Binary file clients/editor/content/icons/zoom_default.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/zoom_in.png
Binary file clients/editor/content/icons/zoom_in.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/content/icons/zoom_out.png
Binary file clients/editor/content/icons/zoom_out.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/gui/offsetedit.xml
--- a/clients/editor/gui/offsetedit.xml	Sun Jan 25 20:17:41 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>
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/add_instance.png
Binary file clients/editor/icons/add_instance.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/add_layer.png
Binary file clients/editor/icons/add_layer.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/delete_layer.png
Binary file clients/editor/icons/delete_layer.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/eraser.png
Binary file clients/editor/icons/eraser.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/hand.png
Binary file clients/editor/icons/hand.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/help.png
Binary file clients/editor/icons/help.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/load_map.png
Binary file clients/editor/icons/load_map.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/map_wizard.png
Binary file clients/editor/icons/map_wizard.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/new_map.png
Binary file clients/editor/icons/new_map.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/quit.png
Binary file clients/editor/icons/quit.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/save_map.png
Binary file clients/editor/icons/save_map.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/select_layer.png
Binary file clients/editor/icons/select_layer.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/take_screenshot.png
Binary file clients/editor/icons/take_screenshot.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/zoom_default.png
Binary file clients/editor/icons/zoom_default.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/zoom_in.png
Binary file clients/editor/icons/zoom_in.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/icons/zoom_out.png
Binary file clients/editor/icons/zoom_out.png has changed
diff -r 3fb17daa1b27 -r 7dc59bd3d6b1 clients/editor/plugins/objectedit.py
--- a/clients/editor/plugins/objectedit.py	Sun Jan 25 20:17:41 2009 +0000
+++ b/clients/editor/plugins/objectedit.py	Fri Jan 30 00:24:50 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('gui/offsetedit.xml')
+		self.container = pychan.loadXML('content/gui/offsetedit.xml')
 		self.container.mapEvents({
 			'x_offset_up' 	: cbwa(self.change_offset_x, 1),
 			'x_offset_dn' 	: cbwa(self.change_offset_x, -1),