[chronojump] Minor fixes on main gui



commit f2f56676650c6ac30349653a14ce6c90e3f527d8
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Dec 9 12:19:03 2019 +0100

    Minor fixes on main gui

 glade/app1.glade      | 42 +++++++++++++++++++++++++++---------------
 src/gui/chronojump.cs | 17 ++++++-----------
 2 files changed, 33 insertions(+), 26 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 6e8c5c8c..70c6f0ba 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7369,7 +7369,6 @@ EncoderInertialCapture</property>
                                                           <widget class="GtkVBox" id="vbox_execute_test">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="spacing">10</property>
                                                             <child>
                                                             <widget class="GtkVBox" id="vbox16">
                                                             <property name="visible">True</property>
@@ -11273,7 +11272,12 @@ EncoderInertialCapture</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkFrame" id="frame_instructions">
+                                                          <widget class="GtkAlignment" id="alignment2">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="top_padding">4</property>
+                                                            <child>
+                                                            <widget class="GtkFrame" 
id="frame_contacts_execute_options">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="label_xalign">0.5</property>
@@ -11290,7 +11294,7 @@ EncoderInertialCapture</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">25</property>
                                                             <child>
-                                                            <widget class="GtkAlignment" id="alignment2">
+                                                            <widget class="GtkAlignment" id="alignment11">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="top_padding">12</property>
@@ -15432,6 +15436,8 @@ Resisted race analyzer</property>
                                                             <property name="type">label_item</property>
                                                             </packing>
                                                             </child>
+                                                            </widget>
+                                                            </child>
                                                           </widget>
                                                           <packing>
                                                             <property name="position">1</property>
@@ -22113,6 +22119,9 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -24360,6 +24369,18 @@ Concentric</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">6</property>
                                                             <child>
+                                                            <widget class="GtkLabel" 
id="label_video_encoder_tests_will_be_filmed">
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">Tests 
will be filmed</property>
+                                                            </widget>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="pack_type">end</property>
+                                                            <property name="position">0</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
                                                             <widget class="GtkHBox" 
id="hbox_video_encoder_capturing">
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">4</property>
@@ -24396,18 +24417,6 @@ Concentric</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkLabel" 
id="label_video_encoder_tests_will_be_filmed">
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Tests 
will be filmed</property>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="pack_type">end</property>
-                                                            <property name="position">0</property>
-                                                            </packing>
-                                                            </child>
-                                                            <child>
                                                             <widget class="GtkHBox" 
id="hbox_video_encoder_no_capturing">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
@@ -31466,6 +31475,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 1cfff735..6b232695 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -7331,12 +7331,11 @@ LogB.Debug("mc finished 5");
        
                button_contacts_person_change.Sensitive = false;
                button_encoder_person_change.Sensitive = false;
+               button_contacts_exercise.Sensitive = false;
                
                //notebooks
-               notebook_execute.Sensitive = false;
                notebook_analyze.Sensitive = false;
                notebook_results.Sensitive = false;
-               notebook_options_top.Sensitive = false;
                encoder_sensitive_all_except_device(false);
 
                vbox_stats.Sensitive = false;
@@ -7388,10 +7387,9 @@ LogB.Debug("mc finished 5");
                if(notebook_encoder_sup.CurrentPage == 1)
                        notebook_encoder_sup.CurrentPage = 0;
 
-               notebook_execute.Sensitive = false;
+               button_contacts_exercise.Sensitive = false;
                notebook_analyze.Sensitive = false;
                notebook_results.Sensitive = false;
-               notebook_options_top.Sensitive = false;
                encoder_sensitive_all_except_device(false);
 
                treeview_persons.Sensitive = false;
@@ -7413,10 +7411,9 @@ LogB.Debug("mc finished 5");
                encoderButtonsSensitive(encoderSensEnum.YESPERSON);
                personChanged();
                
-               notebook_execute.Sensitive = true;
+               button_contacts_exercise.Sensitive = true;
                notebook_analyze.Sensitive = true;
                notebook_results.Sensitive = true;
-               notebook_options_top.Sensitive = true;
                encoder_sensitive_all_except_device(true);
 
                if(! configChronojump.Exhibition)
@@ -7507,7 +7504,7 @@ LogB.Debug("mc finished 5");
                button_threshold.Sensitive = false;
                button_force_sensor_adjust.Sensitive = false;
                button_auto_start.Sensitive = false;
-               notebook_options_top.Sensitive = false;
+               button_contacts_exercise.Sensitive = false;
                event_execute_button_update.Sensitive = false;
                
                //hbox_multi_chronopic_buttons.Sensitive = false;
@@ -7580,7 +7577,7 @@ LogB.Debug("mc finished 5");
                button_threshold.Sensitive = true;
                button_force_sensor_adjust.Sensitive = true;
                button_auto_start.Sensitive = true;
-               notebook_options_top.Sensitive = true;
+               button_contacts_exercise.Sensitive = true;
                event_execute_button_update.Sensitive = true;
 
                //forceSensor and runEncoder does not use currentEventExecute
@@ -7693,9 +7690,8 @@ LogB.Debug("mc finished 5");
                menuitem_mode.Sensitive         = ! start;
                help_menuitem.Sensitive         = ! start;
                frame_persons.Sensitive         = ! start;
+               button_contacts_exercise.Sensitive = ! start;
 
-               hbox_jumps_test.Visible         = ! start;
-               hbox_jump_types_options.Visible = ! start;
                hbox_jump_auto_controls.Visible  = start;
 
                radio_mode_contacts_analyze.Visible = ! start;
@@ -7716,7 +7712,6 @@ LogB.Debug("mc finished 5");
                button_activate_chronopics.Sensitive    = ! execute;
                button_threshold.Sensitive              = ! execute;
                button_execute_test.Sensitive           = ! execute;
-               notebook_options_top.Sensitive          = ! execute;
                sensitiveLastTestButtons(! execute);
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]