[chronojump] Better sensitiveness whie encoder capturing
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Better sensitiveness whie encoder capturing
- Date: Wed, 25 Feb 2015 13:06:55 +0000 (UTC)
commit 6772094e7a6e8db0fce9c21c67ef7e30e83b9bec
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Feb 25 14:06:26 2015 +0100
Better sensitiveness whie encoder capturing
glade/chronojump.glade | 63 +++++++++++++++++++++++++++++++++++++++++++++--
src/gui/chronojump.cs | 2 +-
src/gui/encoder.cs | 16 ++++++++++-
3 files changed, 75 insertions(+), 6 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index efc8205..82f5853 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6576,6 +6576,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7399,6 +7402,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8474,6 +8480,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -9190,6 +9199,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -13103,7 +13115,7 @@ on current Chronojump version.</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox133">
+ <widget class="GtkHBox" id="hbox_encoder_sup_capture_analyze">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -13290,7 +13302,7 @@ on current Chronojump version.</property>
<property name="n_rows">2</property>
<property name="column_spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox75">
+ <widget class="GtkHBox" id="hbox_encoder_configuration">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -13371,7 +13383,7 @@ on current Chronojump version.</property>
<property name="border_width">6</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkHBox" id="hbox79">
+ <widget class="GtkHBox"
id="hbox_encoder_capture_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -19536,6 +19548,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -20160,6 +20175,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -21276,6 +21294,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -21449,6 +21470,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -31089,6 +31113,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33093,6 +33135,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33755,6 +33800,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36383,6 +36431,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -36671,6 +36722,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36974,6 +37028,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9e31f55..aeb3b42 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -6243,7 +6243,7 @@ LogB.Debug("X");
event_execute_button_update.Sensitive = true;
//allow repeat last jump or run (check also if it wasn't cancelled)
- if(! currentEventExecute.Cancel) {
+ if(currentEventExecute != null && ! currentEventExecute.Cancel) {
switch (currentEventType.Type) {
case EventType.Types.REACTIONTIME:
LogB.Information("sensitiveGuiEventDone reaction time");
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index e4b348c..e67c169 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -47,6 +47,10 @@ public partial class ChronoJumpWindow
//at graph.R is converted to Kg*m^2 ( /10000 )
//[Widget] Gtk.SpinButton spin_encoder_capture_inertial;
+ [Widget] Gtk.Box hbox_encoder_sup_capture_analyze;
+ [Widget] Gtk.Box hbox_encoder_configuration;
+ [Widget] Gtk.Box hbox_encoder_capture_options;
+
[Widget] Gtk.Box hbox_encoder_capture_wait;
[Widget] Gtk.Box hbox_encoder_capture_doing;
[Widget] Gtk.Button button_encoder_capture;
@@ -496,6 +500,8 @@ public partial class ChronoJumpWindow
notebook_encoder_capture.PrevPage();
radiobutton_video_encoder_capture.Active = true;
+
+ sensitiveGuiEventDoing();
LogB.Debug("Calling encoderThreadStart for capture");
@@ -3683,7 +3689,8 @@ public partial class ChronoJumpWindow
private void encoderButtonsSensitive(encoderSensEnum option) {
//columns
- //c0 button_encoder_capture
+ //c0 button_encoder_capture, hbox_encoder_sup_capture_analyze,
+ // hbox_encoder_configuration, hbox_encoder_capture_options
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
//c3 hbox_encoder_capture_curves_save_all_none, button_encoder_export_all_curves,
@@ -3692,7 +3699,7 @@ public partial class ChronoJumpWindow
//UNUSED c4 button_encoder_save_curve, entry_encoder_curve_comment
//c5 button_encoder_analyze
//c6 hbox_encoder_user_curves
- //c7 button_encoder_capture_cancel (on capture and analyze)
+ //c7 button_encoder_capture_cancel and button_encoder_analyze_cancel (on capture and analyze)
//c8 button_encoder_capture_finish (only on capture)
//other dependencies
@@ -3743,6 +3750,9 @@ public partial class ChronoJumpWindow
}
button_encoder_capture.Sensitive = Util.IntToBool(table[0]);
+ hbox_encoder_sup_capture_analyze.Sensitive = Util.IntToBool(table[0]);
+ hbox_encoder_configuration.Sensitive = Util.IntToBool(table[0]);
+ hbox_encoder_capture_options.Sensitive = Util.IntToBool(table[0]);
button_encoder_recalculate.Sensitive = Util.IntToBool(table[1]);
@@ -5437,6 +5447,8 @@ LogB.Debug("D");
} else {
encoderButtonsSensitive(encoderSensEnumStored);
}
+
+ sensitiveGuiEventDone();
encoder_pulsebar_capture.Fraction = 1;
//analyze_image_save only has not to be sensitive now because capture graph will be
saved
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
