[chronojump] Removed unused event_execute_button_update and related code
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed unused event_execute_button_update and related code
- Date: Wed, 1 Sep 2021 17:29:34 +0000 (UTC)
commit d8c1d3e10a8f87de1bd2a73abebdbece6978d12d
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Sep 1 19:28:52 2021 +0200
Removed unused event_execute_button_update and related code
glade/app1.glade | 60 +++++++++++++++++-----------------------------
src/gui/app1/chronojump.cs | 54 +----------------------------------------
src/gui/eventExecute.cs | 16 +------------
3 files changed, 24 insertions(+), 106 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 998c08043..9adf36205 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7894,28 +7894,6 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="event_execute_button_update">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Update</property>
- <signal name="clicked"
handler="on_event_execute_button_update_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image1665">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-refresh</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<widget class="GtkAlignment"
id="align_check_vbox_contacts_graph_legend">
<property name="can_focus">False</property>
<property name="bottom_padding">6</property>
@@ -7940,7 +7918,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -7962,7 +7940,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -8075,7 +8053,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -8175,7 +8153,7 @@ EncoderInertialCapture</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">6</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
@@ -25686,6 +25664,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31997,18 +31978,6 @@ 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>
@@ -32045,6 +32014,18 @@ 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>
@@ -41349,6 +41330,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index effd68398..04f31fb43 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4830,13 +4830,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new confgured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
currentEventExecute = new JumpExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpType.Name, myFall, jumpWeight,
cp2016.CP, preferences.digitsNumber,
@@ -5128,13 +5121,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new configured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
currentEventExecute = new JumpRjExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpRjType.Name, myFall, jumpWeight,
progressbarLimit, currentJumpRjType.JumpsLimited,
@@ -5276,13 +5262,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new confgured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
if(photocellWirelessCapture == null)
photocellWirelessCapture = new PhotocellWirelessCapture(wirelessPort);
@@ -5425,13 +5404,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new confgured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
if(photocellWirelessCapture == null)
photocellWirelessCapture = new PhotocellWirelessCapture(wirelessPort);
@@ -5639,13 +5611,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new confgured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
string sep = "";
string description = "";
if(extra_window_radio_reaction_time_discriminative.Active) {
@@ -5822,13 +5787,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new confgured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
currentEventExecute = new PulseExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentPulseType.Name, pulseStep, totalPulses,
cp2016.CP, preferences.digitsNumber,
@@ -6106,14 +6064,6 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_multi_clicked);
event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_multi_clicked);
- /*
- //when user clicks on update the eventExecute window
- //(for showing with his new confgured values: max, min and guides
- event_execute_ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do
this, on_update_clicked it's called 'n' times when 'n' events are done
- event_execute_ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
- */
-
-
//bool syncAvailable = false;
//if(currentMultiChronopicType.SyncAvailable && extra_window_check_multichronopic_sync.Active)
// syncAvailable = true;
@@ -8151,8 +8101,7 @@ LogB.Debug("mc finished 5");
button_force_sensor_sync.Sensitive = false;
button_auto_start.Sensitive = false;
frame_contacts_exercise.Sensitive = false;
- event_execute_button_update.Sensitive = false;
-
+
//hbox_multi_chronopic_buttons.Sensitive = false;
}
@@ -8217,7 +8166,6 @@ LogB.Debug("mc finished 5");
button_force_sensor_sync.Sensitive = true;
button_auto_start.Sensitive = true;
frame_contacts_exercise.Sensitive = true;
- event_execute_button_update.Sensitive = true;
//forceSensor and runEncoder does not use currentEventExecute
if(current_mode == Constants.Modes.FORCESENSOR)
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 520d5a63a..74eac7396 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -67,8 +67,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button event_execute_button_cancel;
[Widget] Gtk.Button event_execute_button_finish;
- [Widget] Gtk.Button event_execute_button_update;
-
+
[Widget] Gtk.Table event_execute_table_jump_reactive;
[Widget] Gtk.Table event_execute_table_run_interval;
[Widget] Gtk.Table event_execute_table_pulse;
@@ -2949,13 +2948,6 @@ public partial class ChronoJumpWindow
eventGraphConfigureWin = EventGraphConfigureWindow.Show(true);
}
- void on_event_execute_button_update_clicked (object o, EventArgs args)
- {
- //event will be raised, and managed in chronojump.cs
- //see ButtonUpdate at end of class
- }
-
-
void on_event_execute_finish_clicked (object o, EventArgs args)
{
//event will be raised, and managed in chronojump.cs
@@ -3141,12 +3133,6 @@ public partial class ChronoJumpWindow
{
get { return event_execute_button_finish; }
}
-
- public Button event_execute_ButtonUpdate
- {
- get { return event_execute_button_update; }
- }
-
}
//to prepare data before calling cairo method
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
