Mercurial > fife-parpg

diff clients/editor/gui/objectedit.xml @ 307:22253b2c9b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- added LightEdit editor plugin (needs light branch to work; deactivated if lighting renderer is not available) - added animation viewer to ObjectEdit - several bugfixes for ObjectEdit plugin FEATURES: - ObjectEdit - viewing and rotating animated instances (rotations are hardcoded for now, FIFE needs to expose available angles to python in order to make animation rotation work for every client) - LightEdit - test global light values
author chewie@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 11 Aug 2009 15:32:54 +0000
parents 51cc05d862f2
children
line wrap: on
line diff
--- a/clients/editor/gui/objectedit.xml	Sat Aug 08 14:24:35 2009 +0000
+++ b/clients/editor/gui/objectedit.xml	Tue Aug 11 15:32:54 2009 +0000
@@ -1,9 +1,9 @@
-<Panel title="Object editor" position="10,700"> <!-- size="200,250" min_size="200,250" max_size="200,250" > -->
-
+<Panel title="Object editor" position="10,700" min_size="200,250"> <!-- size="200,250" min_size="200,250" max_size="200,250" > -->
 	<Label text="           Object" background_color="0,0,0" />
-	<Label text="Namespace:" min_size="85,20"/>
-	<Label text="None" name="object_namespace" min_size="30,20"/>
-
+	<HBox>
+		<Label text="Namespace:" min_size="85,20"/>
+		<Label text="None" name="object_namespace" min_size="30,20"/>
+	</HBox>
 	<HBox>	 
 		<Label text="Object ID:" min_size="85,20"/>
 		<Label text="None" name="object_id" min_size="30,20"/>
@@ -16,28 +16,56 @@
 		<TextBox text="0" name="object_static" min_size="20,20"/>
 	</HBox>
 
-	<Button name="change_data" text="Save object"/>
-
 	<Label text="          Selected Instance" background_color="0,0,0" />
 
 	<HBox>	 
 		<Label text="Select Rotation:" min_size="85,20" />
-		<DropDown min_size="80,0" name="select_rotations"/>
 	</HBox>
 	
+	<DropDown min_size="80,0" name="select_rotations"/>
+
+	<VBox>
+		<Label text="Offset:" min_size="45,20"/>
+		<HBox>
+			<Label text="X: " min_size="25,20"/>
+			<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>
+			<Label text="Y: " min_size="25,20"/>
+			<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" hexpand="1"/>
+		<TextBox text="0" name="instance_rotation" min_size="30,20"/>
 	</HBox>
 
-	<VBox name="animation_panel_wrapper" max_size="150,50">
+	<HBox>
+		<Button name="use_data" text="Use"/>
+	</HBox>
+	<Spacer />
+	<Button name="change_data" text="Save rotation"/>
+
+
+	<Label text="          Animation viewer" background_color="0,0,0" />
+	<VBox name="animation_panel_wrapper">
 		<Spacer />
 		<VBox name="animation_panel">
-			<Label text="Animation panel" min_size="85,20" />
+			<Label text="Actions:" min_size="85,20" />
+			<DropDown min_size="80,0" name="select_actions"/>
+
 			<HBox>
 				<Button name="anim_start_pos" text="S" max_size="20,20"/>
 				<Button name="anim_left" text="l1" max_size="20,20"/>
@@ -45,11 +73,21 @@
 				<Button name="anim_right" text="r1" max_size="20,20"/>
 				<Button name="anim_end_pos" text="E" max_size="20,20"/>
 			</HBox>
+			<HBox>
+				<ToggleButton name="anim_playback" text="P" max_size="20,20"/>
+				<CheckBox name="anim_loop" marked="1" text="Loop:"/>
+			</HBox>
+			
+			<HBox>
+				<Label text="Rotation: (" min_size="60,20" />
+				<Label name="anim_rotation" text="" min_size="20,20"/>
+				<Label text=")" min_size="10,20" />
+			</HBox>			
+
+			<VBox min_size="100,100" size="100,100">
+			<Icon image="gui/icons/add_instance.png" size="200,200" min_size="250,250" name="animTest"/>
+			</VBox>
 		</VBox>
 	</VBox>
 
-	<HBox>
-		<Button name="use_data" text="Use"/>
-	</HBox>	
-
 </Panel>