commit 6f601ae5aa29dfd7432b4259c7c46e1dca1ce930
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 23 11:51:11 2021 +0100
Session load top right view column icons
glade/app1.glade | 242 +++++++++++++++++++++++++++----------------
src/gui/app1/icons.cs | 12 +++
src/gui/app1/session/main.cs | 10 ++
3 files changed, 177 insertions(+), 87 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8b910eff..98784453 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24515,6 +24515,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -30598,6 +30601,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>
@@ -30634,18 +30649,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>
@@ -39044,6 +39047,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -40781,7 +40787,7 @@ then click this button.</property>
<widget class="GtkHBox"
id="app1s_hbox_load_controls">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">25</property>
<child>
<widget class="GtkVBox" id="vbox208">
<property name="visible">True</property>
@@ -40890,55 +40896,81 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox216">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkFrame" id="frame12">
+ <widget class="GtkVBox" id="vbox254">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0.5</property>
- <property name="label_yalign">1</property>
- <property name="shadow_type">none</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox254">
+ <widget class="GtkTable" id="table20">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox405">
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_jumps">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label575">
+ <widget class="GtkImage"
id="app1s_image_show_data_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Show
more columns</property>
- <property name="use_markup">True</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_persons">
- <property name="label"
translatable="yes">Persons</property>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_force_sensor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_force_sensor">
+ <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">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_encoder">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox500">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_encoder_grav">
+ <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>
@@ -40947,103 +40979,137 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table20">
+ <widget class="GtkImage"
id="app1s_image_show_data_encoder_inertial">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_jumps">
- <property name="label"
translatable="yes">Jumps</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <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>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_runs">
- <property name="label"
translatable="yes">Races</property>
- <property name="visible">True</property>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_rt">
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_rt">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_force_sensor">
- <property name="label" translatable="yes">Force
sensor</property>
- <property name="visible">True</property>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_other">
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_other">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_encoder">
- <property name="label"
translatable="yes">Encoder</property>
+ <widget class="GtkLabel" id="label575">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">View</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_rt">
- <property name="label"
translatable="yes">Reaction time</property>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_persons">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_other">
- <property name="label"
translatable="yes">Other</property>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_runs">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox405">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_runs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_show_data_run_encoder">
+ <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>
@@ -41053,17 +41119,18 @@ then click this button.</property>
</child>
</widget>
</child>
- <child>
- <placeholder/>
+ </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</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>
@@ -41071,6 +41138,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index e5a785f8..62007d56 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -358,8 +358,19 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_weight.png");
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
+ app1s_image_show_data_encoder_grav.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_inertia.png");
image_mode_encoder_inertial.Pixbuf = pixbuf;
+ app1s_image_show_data_encoder_inertial.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_jump.png");
+ app1s_image_show_data_jumps.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_run.png");
+ app1s_image_show_data_runs.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "race_encoder_icon.png");
+ app1s_image_show_data_run_encoder.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "force_sensor_icon.png");
+ app1s_image_show_data_force_sensor.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_capture.png");
image_tests_capture.Pixbuf = pixbuf;
@@ -379,6 +390,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person.png");
image_person.Pixbuf = pixbuf;
image_person1.Pixbuf = pixbuf;
+ app1s_image_show_data_persons.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_info.png");
image_info1.Pixbuf = pixbuf;
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 538e0e44..6851b0ee 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -68,6 +68,16 @@ public partial class ChronoJumpWindow
[Widget] Gtk.CheckButton app1s_checkbutton_show_data_encoder;
[Widget] Gtk.CheckButton app1s_checkbutton_show_data_rt;
[Widget] Gtk.CheckButton app1s_checkbutton_show_data_other;
+ [Widget] Gtk.Image app1s_image_show_data_persons;
+ [Widget] Gtk.Image app1s_image_show_data_jumps;
+ [Widget] Gtk.Image app1s_image_show_data_runs;
+ [Widget] Gtk.Image app1s_image_show_data_run_encoder;
+ [Widget] Gtk.Image app1s_image_show_data_rt;
+ [Widget] Gtk.Image app1s_image_show_data_force_sensor;
+ [Widget] Gtk.Image app1s_image_show_data_encoder_grav;
+ [Widget] Gtk.Image app1s_image_show_data_encoder_inertial;
+ [Widget] Gtk.Image app1s_image_show_data_other;
+
[Widget] Gtk.Label app1s_file_path_import;
[Widget] Gtk.Notebook app1s_notebook_load_button_animation;
[Widget] Gtk.HButtonBox app1s_hbuttonbox_page2_import;