[chronojump] Overview on top of button load (encoder, forceSensor, raceAnalyzer)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Overview on top of button load (encoder, forceSensor, raceAnalyzer)
- Date: Thu, 2 Apr 2020 10:00:58 +0000 (UTC)
commit dd4c2cefeae4c8296ca8bc98a8231744f70ce8ec
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Apr 2 11:53:55 2020 +0200
Overview on top of button load (encoder, forceSensor, raceAnalyzer)
glade/app1.glade | 66 +++++++++++++++++++++++++++++++++-------------
src/gui/app1/chronojump.cs | 24 +++++------------
src/gui/app1/encoder.cs | 6 +++--
src/gui/app1/icons.cs | 11 +++-----
4 files changed, 61 insertions(+), 46 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index ac183163..0f98c2ed 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -477,22 +477,6 @@
</child>
</widget>
</child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_encoder_session_overview">
- <property name="label" translatable="yes">Overview of this session</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image_menuitem_encoder_session_overview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -7003,7 +6987,26 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <placeholder/>
+ <widget class="GtkButton"
id="button_contacts_capture_session_overview">
+ <property name="width_request">60</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Overview of this session</property>
+ <signal name="clicked"
handler="on_session_overview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_contacts_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton"
id="button_contacts_capture_load">
@@ -24797,6 +24800,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26495,7 +26504,21 @@ Concentric</property>
</packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkButton"
id="button_encoder_capture_session_overview">
+ <property name="width_request">60</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Overview of this session</property>
+ <signal name="clicked"
handler="on_session_overview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -34753,6 +34776,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -35298,7 +35327,6 @@ then click this button.</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Overview of this session</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_menu_session_overview_clicked" swapped="no"/>
<child>
<widget class="GtkEventBox"
id="eventbox_button_menu_session_overview3">
<property name="visible">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 3cca3cd7..404d21fe 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -212,9 +212,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_edit_session;
[Widget] Gtk.MenuItem menuitem_delete_session;
[Widget] Gtk.MenuItem menuitem_export_csv;
- [Widget] Gtk.MenuItem menuitem_encoder_session_overview;
- [Widget] Gtk.MenuItem menuitem_forceSensor_session_overview;
- [Widget] Gtk.MenuItem menuitem_runEncoder_session_overview;
[Widget] Gtk.Image image_session_open;
//menu person
@@ -234,6 +231,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_contacts_exercise_selected_options;
[Widget] Gtk.Notebook notebook_contacts_capture_doing_wait;
[Widget] Gtk.Button button_contacts_bells;
+ [Widget] Gtk.Button button_contacts_capture_session_overview;
[Widget] Gtk.Button button_contacts_capture_load;
[Widget] Gtk.Button button_contacts_exercise_close_and_recalculate;
[Widget] Gtk.VBox vbox_contacts_signal_comment;
@@ -2590,7 +2588,7 @@ public partial class ChronoJumpWindow
}
}
- private void on_button_menu_session_overview_clicked (object o, EventArgs args)
+ private void on_session_overview_clicked (object o, EventArgs args)
{
if (currentSession == null)
return;
@@ -3163,10 +3161,6 @@ public partial class ChronoJumpWindow
notebook_start_selector.CurrentPage = 0;
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
- //changes in menus
- //vbox_menu_encoder.Visible = false;
- button_session_overview.Sensitive = false;
-
//show title
string tempSessionName = "";
if(currentSession != null)
@@ -3247,7 +3241,6 @@ public partial class ChronoJumpWindow
vbox_contacts_load_recalculate.Visible = false;
vbox_contacts_signal_comment.Visible = false;
frame_jumps_automatic.Visible = false;
- button_session_overview.Sensitive = false;
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
if(
@@ -3349,7 +3342,6 @@ public partial class ChronoJumpWindow
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
blankEncoderInterface();
- button_session_overview.Sensitive = true;
bool changed = false;
if(m == Constants.Menuitem_modes.POWERGRAVITATORY)
@@ -3441,6 +3433,7 @@ public partial class ChronoJumpWindow
vbox_contacts_load_recalculate.Visible = true;
vbox_contacts_signal_comment.Visible = true;
button_contacts_capture_load.Sensitive = myTreeViewPersons.IsThereAnyRecord();
+ button_contacts_capture_session_overview.Sensitive =
myTreeViewPersons.IsThereAnyRecord();
button_contacts_bells.Sensitive = true;
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
@@ -3454,8 +3447,6 @@ public partial class ChronoJumpWindow
notebook_capture_graph_table.CurrentPage = 1; //"Show table"
notebook_capture_graph_table.ShowTabs = false;
setLabelContactsExerciseSelected(m);
-
- button_session_overview.Sensitive = true;
}
else if(m == Constants.Menuitem_modes.RUNSENCODER)
{
@@ -3465,6 +3456,7 @@ public partial class ChronoJumpWindow
vbox_contacts_load_recalculate.Visible = true;
vbox_contacts_signal_comment.Visible = true;
button_contacts_capture_load.Sensitive = myTreeViewPersons.IsThereAnyRecord();
+ button_contacts_capture_session_overview.Sensitive =
myTreeViewPersons.IsThereAnyRecord();
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
@@ -3481,8 +3473,6 @@ public partial class ChronoJumpWindow
combo_race_analyzer_device.Active = 0;
forceSensorImageTestChange();
setLabelContactsExerciseSelected(m);
-
- button_session_overview.Sensitive = true;
}
else if(m == Constants.Menuitem_modes.RT)
{
@@ -7352,13 +7342,9 @@ LogB.Debug("mc finished 5");
private void menuSessionSensitive(bool option)
{
button_session_edit.Sensitive = option;
- button_session_overview.Sensitive = option;
menuitem_export_csv.Sensitive = option;
button_session_export.Sensitive = option;
- menuitem_encoder_session_overview.Sensitive = option;
- menuitem_forceSensor_session_overview.Sensitive = option;
- menuitem_runEncoder_session_overview.Sensitive = option;
}
private void menuPersonSelectedSensitive(bool option)
@@ -7437,6 +7423,7 @@ LogB.Debug("mc finished 5");
button_execute_test.Sensitive = false;
button_auto_start.Sensitive = false;
button_contacts_capture_load.Sensitive = false;
+ button_contacts_capture_session_overview.Sensitive = false;
encoderButtonsSensitive(encoderSensEnum.NOPERSON);
//don't cal personChanged because it will make changes on analyze repetitions and
currentPerson == null
@@ -7465,6 +7452,7 @@ LogB.Debug("mc finished 5");
button_execute_test.Sensitive = true;
button_auto_start.Sensitive = true;
button_contacts_capture_load.Sensitive = true;
+ button_contacts_capture_session_overview.Sensitive = true;
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
personChanged();
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 92651136..13259ace 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -98,6 +98,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_capture_finish;
[Widget] Gtk.Button button_encoder_capture_finish_cont;
[Widget] Gtk.Button button_encoder_exercise_close_and_recalculate;
+ [Widget] Gtk.Button button_encoder_capture_session_overview;
[Widget] Gtk.Button button_encoder_load_signal;
[Widget] Gtk.Button button_encoder_load_signal_on_analyze;
[Widget] Gtk.Viewport viewport_image_encoder_capture;
@@ -5043,7 +5044,7 @@ public partial class ChronoJumpWindow
//c0 button_encoder_capture, hbox_encoder_sup_capture_analyze_two_buttons,
// hbox_encoder_configuration, frame_encoder_capture_options
//c1 button_encoder_exercise_close_and_recalculate
- //c2 button_encoder_load_signal
+ //c2 button_encoder_capture_session_overview, button_encoder_load_signal
//c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal,
//button_menu_encoder_export_set
// button_encoder_delete_signal, vbox_encoder_signal_comment,
// and images: image_encoder_capture , image_encoder_analyze.Sensitive. Update: both NOT
managed here
@@ -5100,7 +5101,8 @@ public partial class ChronoJumpWindow
frame_encoder_capture_options.Sensitive = Util.IntToBool(table[0]);
button_encoder_exercise_close_and_recalculate.Sensitive = Util.IntToBool(table[1]);
-
+
+ button_encoder_capture_session_overview.Sensitive = Util.IntToBool(table[2]);
button_encoder_load_signal.Sensitive = Util.IntToBool(table[2]);
button_encoder_load_signal_on_analyze.Sensitive = Util.IntToBool(table[2]);
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 104d0e02..dfc3269c 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -54,6 +54,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_contacts_exercise;
[Widget] Gtk.Image image_contacts_exercise_close;
[Widget] Gtk.Image image_contacts_capture_load;
+ [Widget] Gtk.Image image_contacts_session_overview;
+ [Widget] Gtk.Image image_encoder_session_overview;
[Widget] Gtk.Image image_contacts_recalculate;
[Widget] Gtk.Image image_rest;
[Widget] Gtk.Image image_all_persons_events;
@@ -164,7 +166,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_analyze_image_compujump_send_email_image;
[Widget] Gtk.Image image_encoder_analyze_image_compujump_send_email_send;
[Widget] Gtk.Image image_encoder_analyze_check;
- [Widget] Gtk.Image image_menuitem_encoder_session_overview;
[Widget] Gtk.Image image_encoder_rest_time;
//force sensor
@@ -186,14 +187,12 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_laterality_both;
[Widget] Gtk.Image image_force_sensor_laterality_r;
[Widget] Gtk.Image image_force_sensor_laterality_l;
- [Widget] Gtk.Image image_menuitem_forceSensor_session_overview;
//race encoder
[Widget] Gtk.Image image_race_encoder_open_folder;
[Widget] Gtk.Image image_run_encoder_exercise_edit;
[Widget] Gtk.Image image_run_encoder_exercise_add;
[Widget] Gtk.Image image_run_encoder_exercise_delete;
- [Widget] Gtk.Image image_menuitem_runEncoder_session_overview;
[Widget] Gtk.Image image_run_encoder_analyze_load;
//video play icons
@@ -694,10 +693,8 @@ public partial class ChronoJumpWindow
UtilGtk.DeviceColors(viewport_chronopic_encoder, true);
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_grid_on.png");
- image_menuitem_encoder_session_overview.Pixbuf = pixbuf;
- image_menuitem_forceSensor_session_overview.Pixbuf = pixbuf;
- image_menuitem_runEncoder_session_overview.Pixbuf = pixbuf;
- image_session_overview.Pixbuf = pixbuf;
+ image_contacts_session_overview.Pixbuf = pixbuf;
+ image_encoder_session_overview.Pixbuf = pixbuf;
//encoder
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_powerbars);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
