From: Pierre C. <Ba...@us...> - 2012-04-23 22:25:34
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "krobot". The branch, master has been updated via 9ddc98c3ea90aee3feff58d375a76516b7553b02 (commit) from 87263167c3172b765e0232d7e424ded68d057c95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9ddc98c3ea90aee3feff58d375a76516b7553b02 Author: chicco <cha...@cr...> Date: Tue Apr 24 00:25:23 2012 +0200 [krobot_viewer] commit glade file ----------------------------------------------------------------------- Changes: diff --git a/info/control2011/src/tools/krobot_viewer_ui.glade b/info/control2011/src/tools/krobot_viewer_ui.glade index 238adf1..4abeca2 100644 --- a/info/control2011/src/tools/krobot_viewer_ui.glade +++ b/info/control2011/src/tools/krobot_viewer_ui.glade @@ -592,83 +592,173 @@ <property name="can_focus">True</property> <property name="expanded">True</property> <child> - <widget class="GtkHBox" id="settings_subbox"> + <widget class="GtkHBox" id="settings_overbox"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkVBox" id="line_settings_box"> + <widget class="GtkHBox" id="settings_subbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <widget class="GtkLabel" id="line_settings_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Lines</property> - </widget> - <packing> - <property name="position">0</property> - </packing> - </child> + <property name="homogeneous">True</property> <child> - <widget class="GtkHBox" id="line_settings_label_box"> + <widget class="GtkVBox" id="line_settings_box"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="lines_speed_label"> + <widget class="GtkLabel" id="line_settings_label"> <property name="visible">True</property> - <property name="label" translatable="yes">speed</property> + <property name="label" translatable="yes">Lines</property> </widget> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="lines_acceleration_label"> + <widget class="GtkHBox" id="line_settings_label_box"> <property name="visible">True</property> - <property name="yalign">0.47999998927116394</property> - <property name="label" translatable="yes">accel</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkLabel" id="lines_speed_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">speed</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="lines_acceleration_label"> + <property name="visible">True</property> + <property name="yalign">0.47999998927116394</property> + <property name="label" translatable="yes">accel</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> <property name="position">1</property> </packing> </child> + <child> + <widget class="GtkHBox" id="line_settings_value_box"> + <property name="visible">True</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkSpinButton" id="moving_speed"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">0.99999999999999989 0 2 0.10000000000000001 0 0</property> + <property name="digits">2</property> + <property name="numeric">True</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="moving_acceleration"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">1 0 10 0.10000000000000001 0 0</property> + <property name="digits">2</property> + <property name="numeric">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> </widget> <packing> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="line_settings_value_box"> + <widget class="GtkVBox" id="rotation_settings_box"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkSpinButton" id="moving_speed"> + <widget class="GtkLabel" id="rotation_settings_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">0.99999999999999989 0 2 0.10000000000000001 0 0</property> - <property name="digits">2</property> - <property name="numeric">True</property> + <property name="label" translatable="yes">Rotation</property> + <property name="selectable">True</property> </widget> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="moving_acceleration"> + <widget class="GtkHBox" id="rotation_settings_label_box"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">1 0 10 0.10000000000000001 0 0</property> - <property name="digits">2</property> - <property name="numeric">True</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkLabel" id="rotation_speed_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">speed</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="rotation_acceleration_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">accel</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> <property name="position">1</property> </packing> </child> + <child> + <widget class="GtkHBox" id="rotation_settings_value_box"> + <property name="visible">True</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkSpinButton" id="rotation_speed"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">2.0000000000000004 0 4 0.10000000000000001 0 0</property> + <property name="digits">2</property> + <property name="numeric">True</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="rotation_acceleration"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">2.0000000000000009 0 10 0.10000000000000001 0 0</property> + <property name="digits">2</property> + <property name="numeric">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> </widget> <packing> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </widget> @@ -677,36 +767,60 @@ </packing> </child> <child> - <widget class="GtkVBox" id="rotation_settings_box"> + <widget class="GtkVBox" id="bezier_limits_vbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="rotation_settings_label"> + <widget class="GtkVBox" id="v_max_box"> <property name="visible">True</property> - <property name="label" translatable="yes">Rotation</property> - <property name="selectable">True</property> + <property name="orientation">vertical</property> + <child> + <widget class="GtkLabel" id="v_max_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">max speed</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="v_max"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">0.5 0.01 2 0.10000000000000001 1 1</property> + <property name="digits">2</property> + <property name="numeric">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="rotation_settings_label_box"> + <widget class="GtkVBox" id="a_tan_max_box"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="rotation_speed_label"> + <widget class="GtkLabel" id="a_tan_max_label"> <property name="visible">True</property> - <property name="label" translatable="yes">speed</property> + <property name="label" translatable="yes">max tangential accel</property> </widget> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="rotation_acceleration_label"> + <widget class="GtkSpinButton" id="a_tan_max"> <property name="visible">True</property> - <property name="label" translatable="yes">accel</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">1 0.01 4 0.10000000000000001 1 1</property> + <property name="digits">2</property> + <property name="numeric">True</property> </widget> <packing> <property name="position">1</property> @@ -718,28 +832,24 @@ </packing> </child> <child> - <widget class="GtkHBox" id="rotation_settings_value_box"> + <widget class="GtkVBox" id="a_rand_max_box"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkSpinButton" id="rotation_speed"> + <widget class="GtkLabel" id="a_rad_max_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">2.0000000000000004 0 4 0.10000000000000001 0 0</property> - <property name="digits">2</property> - <property name="numeric">True</property> + <property name="label" translatable="yes">max radial accel</property> </widget> <packing> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="rotation_acceleration"> + <widget class="GtkSpinButton" id="a_rad_max"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">2.0000000000000009 0 10 0.10000000000000001 0 0</property> + <property name="invisible_char">●</property> + <property name="adjustment">1 0.01 4 0.10000000000000001 1 1</property> <property name="digits">2</property> <property name="numeric">True</property> </widget> hooks/post-receive -- krobot |