commit fea14da716d9588b92e0d97b25580a5362e36fad
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 30 16:36:16 2021 +0200
Better gui for exercise frame, button, and hidden selected_name
glade/app1.glade | 124 +++++++++++++++++++++------------------------
src/gui/app1/chronojump.cs | 5 +-
src/gui/app1/icons.cs | 3 --
3 files changed, 62 insertions(+), 70 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5ebf03048..ae0938d76 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -5894,16 +5894,35 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="label_yalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">out</property>
<child>
<widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="top_padding">2</property>
+ <property name="bottom_padding">2</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">2</property>
+ <child>
+ <widget class="GtkVBox" id="vbox66">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_combo_select_contacts_top">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox152">
<property name="visible">True</property>
@@ -5922,28 +5941,8 @@ EncoderInertialCapture</property>
<widget class="GtkAlignment" id="alignment60">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">2</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">4</property>
- <property name="right_padding">4</property>
- <child>
- <widget class="GtkVBox" id="vbox230">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_contacts_exercise">
- <property name="width_request">24</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="left_padding">1</property>
+ <property name="right_padding">1</property>
<child>
<widget class="GtkImage"
id="image_contacts_exercise_settings">
<property name="width_request">24</property>
@@ -5951,13 +5950,6 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
</child>
</widget>
</child>
@@ -5972,21 +5964,6 @@ EncoderInertialCapture</property>
<widget class="GtkVBox" id="vbox158">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_select_contacts_top">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<widget class="GtkLabel"
id="label_contacts_exercise_selected_name">
<property name="visible">True</property>
@@ -5998,7 +5975,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -6034,7 +6011,14 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -6049,7 +6033,11 @@ EncoderInertialCapture</property>
</widget>
</child>
<child>
- <placeholder/>
+ <widget class="GtkLabel" id="label654">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Exercise</property>
+ </widget>
<packing>
<property name="type">label_item</property>
</packing>
@@ -25812,6 +25800,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32123,18 +32114,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>
@@ -32171,6 +32150,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>
@@ -41420,6 +41411,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 d80583c90..b88536f72 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3414,6 +3414,7 @@ public partial class ChronoJumpWindow
hbox_combo_select_contacts_top.Visible = false; //TODO: this will be unneded
//blank exercise options: useful for changing from jumps or runs to forceSensor, runEncoder,
reaction time, other
+ label_contacts_exercise_selected_name.Visible = true; //will not be visible when all the
contacts_top combo is implemented
label_contacts_exercise_selected_options.Text = "";
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
@@ -3484,6 +3485,7 @@ public partial class ChronoJumpWindow
}
createComboSelectContactsTop (true);
+ label_contacts_exercise_selected_name.Visible = false;
hbox_combo_select_contacts_top.Visible = true; //this will be unneded
/*
@@ -3548,6 +3550,7 @@ public partial class ChronoJumpWindow
}
createComboSelectContactsTop (true);
+ label_contacts_exercise_selected_name.Visible = false;
hbox_combo_select_contacts_top.Visible = true; //this will be unneded
@@ -3799,8 +3802,6 @@ public partial class ChronoJumpWindow
if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
image_encoder_exercise.Pixbuf = pixbufModeCurrent;
- else
- image_contacts_exercise.Pixbuf = pixbufModeCurrent;
//show feedback icon
Pixbuf pixbufBellActive = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_active.png");
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 4bef13e0d..183732112 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -47,7 +47,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_edit_current_person_h;
//[Widget] Gtk.Image image_persons_up;
//[Widget] Gtk.Image image_persons_down;
- [Widget] Gtk.Image image_contacts_exercise;
[Widget] Gtk.Image image_contacts_exercise_settings;
[Widget] Gtk.Image image_contacts_exercise_close;
[Widget] Gtk.Image image_contacts_capture_load;
@@ -474,8 +473,6 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_modes.png");
image_button_show_modes_contacts_grid.Pixbuf = pixbuf;
image_button_show_modes_encoder_grid.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_jump_simple.png");
- image_contacts_exercise.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_weight.png");
image_encoder_exercise.Pixbuf = pixbuf;