[chronojump/michrolab] Removed icons for modes, using just Mode label
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/michrolab] Removed icons for modes, using just Mode label
- Date: Thu, 14 Jul 2022 16:37:51 +0000 (UTC)
commit 0b869b93cbc4202be0897c2375719eff8ffe0099
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri May 27 20:46:17 2022 +0200
Removed icons for modes, using just Mode label
glade/app1.glade | 12 ++++--------
src/Makefile.am | 7 -------
src/gui/app1/chronojump.cs | 42 ++----------------------------------------
src/gui/app1/icons.cs | 3 ---
4 files changed, 6 insertions(+), 58 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 4c7f73d9f..0847c0a5e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -4029,7 +4029,6 @@ EncoderInertialCapture</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button_show_modes_contacts">
- <property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -4039,11 +4038,10 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_button_show_modes_contacts_grid">
- <property name="width_request">24</property>
+ <widget class="GtkLabel" id="label52">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="label"
translatable="yes">Mode</property>
</widget>
</child>
</widget>
@@ -30389,7 +30387,6 @@ Concentric</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton"
id="button_show_modes_encoder">
- <property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -30399,11 +30396,10 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_button_show_modes_encoder_grid">
- <property name="width_request">24</property>
+ <widget class="GtkLabel" id="label71">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="label"
translatable="yes">Mode</property>
</widget>
</child>
</widget>
diff --git a/src/Makefile.am b/src/Makefile.am
index ebc2b9448..a8e503de6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -578,13 +578,6 @@ RESOURCES = \
../images/md/save_blue.png,save.png \
../images/md/new_releases_blue.png,new.png \
../images/md/menu_blue.png,image_menu.png \
- ../images/md/apps_6_sep_blue.png,image_modes.png \
- ../images/md/apps_6_sep_jump_blue.png,image_modes_jump.png \
- ../images/md/apps_6_sep_run_blue.png,image_modes_run.png \
- ../images/md/apps_6_sep_force_blue.png,image_modes_force.png \
- ../images/md/apps_6_sep_encoder_blue.png,image_modes_encoder.png \
- ../images/md/apps_6_sep_rt_blue.png,image_modes_rt.png \
- ../images/md/apps_6_sep_other_blue.png,image_modes_other.png \
../images/md/menu_book_blue.png,image_book.png \
../images/md/keyboard_blue.png,image_keyboard.png \
../images/md/more_horiz_blue.png,image_more_horiz.png \
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index af635cb01..6d3521808 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -127,9 +127,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_radio_mode_contacts_analyze_buttons;
[Widget] Gtk.HBox hbox_radio_mode_contacts_analyze_jump_simple_buttons;
- [Widget] Gtk.Image image_button_show_modes_contacts_grid;
- [Widget] Gtk.Image image_button_show_modes_encoder_grid;
-
//radio group
[Widget] Gtk.RadioButton radio_mode_contacts_capture;
[Widget] Gtk.RadioButton radio_mode_contacts_analyze;
@@ -3643,10 +3640,6 @@ public partial class ChronoJumpWindow
return;
}
-
- Pixbuf pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes.png");
- Pixbuf pixbufModeCurrent;
-
if(m == Constants.Modes.JUMPSSIMPLE || m == Constants.Modes.JUMPSREACTIVE)
{
button_contacts_detect.Visible = true;
@@ -3675,7 +3668,6 @@ public partial class ChronoJumpWindow
//vbox_contacts_graph_legend.Visible = false;
frame_jumps_automatic.Visible = true;
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_jump_simple.png");
if(radio_mode_contacts_analyze.Active)
radio_mode_contacts_analyze_buttons_visible (m);
@@ -3690,8 +3682,6 @@ public partial class ChronoJumpWindow
//align_check_vbox_contacts_graph_legend.Visible = false;
//vbox_contacts_graph_legend.Visible = false;
-
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_jump_reactive.png");
}
createComboSelectContactsTop ();
@@ -3706,8 +3696,6 @@ public partial class ChronoJumpWindow
if(radio_mode_contacts_analyze.Active)
radio_mode_contacts_analyze_buttons_visible (m);
-
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_jump.png");
}
else if(m == Constants.Modes.RUNSSIMPLE || m == Constants.Modes.RUNSINTERVALLIC)
{
@@ -3753,8 +3741,6 @@ public partial class ChronoJumpWindow
//show icon but have it unsensitive until there's a run
button_inspect_last_test_run_simple.Visible = true;
button_inspect_last_test_run_simple.Sensitive = false;
-
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_run_simple.png");
}
else
{
@@ -3777,7 +3763,6 @@ public partial class ChronoJumpWindow
//vbox_contacts_graph_legend.Visible = false;
createTreeView_runs_interval_sprint (treeview_runs_interval_sprint);
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_run_multiple.png");
if(radio_mode_contacts_analyze.Active)
radio_mode_contacts_analyze_buttons_visible (m);
@@ -3786,9 +3771,6 @@ public partial class ChronoJumpWindow
createComboSelectContactsTop ();
label_contacts_exercise_selected_name.Visible = false;
hbox_combo_select_contacts_top_with_arrows.Visible = true; //this will be unneded
-
-
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_run.png");
}
else if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
{
@@ -3843,7 +3825,6 @@ public partial class ChronoJumpWindow
hbox_encoder_exercise_inertia.Visible = false;
hbox_encoder_exercise_gravitatory_min_mov.Visible = true;
hbox_encoder_exercise_inertial_min_mov.Visible = false;
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_weight.png");
if(radio_encoder_analyze_individual_current_set.Active ||
radio_encoder_analyze_individual_current_session.Active)
{
@@ -3857,6 +3838,7 @@ public partial class ChronoJumpWindow
label_gravitatory_vpf_propulsive.Visible = preferences.encoderPropulsive;
notebook_encoder_top.Page = 0;
+ image_encoder_exercise.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_weight.png");
}
else //(m == Constants.Modes.POWERINERTIAL)
{
@@ -3893,7 +3875,7 @@ public partial class ChronoJumpWindow
label_gravitatory_vpf_propulsive.Visible = false;
notebook_encoder_top.Page = 1;
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"image_inertia.png");
+ image_encoder_exercise.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_inertia.png");
}
encoderConfigurationGUIUpdate();
encoderGuiChangesAfterEncoderConfigurationWin(true);
@@ -3906,8 +3888,6 @@ public partial class ChronoJumpWindow
setEncoderExerciseOptionsFromPreferences();
encoderPreferencesSet = true;
}
-
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) +
"image_modes_encoder.png");
}
else if(Constants.ModeIsFORCESENSOR (m))
{
@@ -3954,9 +3934,6 @@ public partial class ChronoJumpWindow
createComboSelectContactsTop ();
label_contacts_exercise_selected_name.Visible = false;
hbox_combo_select_contacts_top_with_arrows.Visible = true; //this will be unneded
-
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"force_sensor_icon.png");
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) +
"image_modes_force.png");
}
else if(m == Constants.Modes.RUNSENCODER)
{
@@ -3999,9 +3976,6 @@ public partial class ChronoJumpWindow
createComboSelectContactsTop ();
label_contacts_exercise_selected_name.Visible = false;
hbox_combo_select_contacts_top_with_arrows.Visible = true; //this will be unneded
-
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"race_encoder_icon.png");
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_run.png");
}
else if(m == Constants.Modes.RT)
{
@@ -4019,9 +3993,6 @@ public partial class ChronoJumpWindow
label_contacts_exercise_selected_options.Visible = true;
image_top_laterality_contacts.Visible = false;
-
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"reaction_time_icon.png");
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_rt.png");
}
else { //m == Constants.Modes.OTHER (contacts / other)
event_execute_drawingarea.Visible = true;
@@ -4042,17 +4013,8 @@ public partial class ChronoJumpWindow
label_contacts_exercise_selected_options.Visible = true;
image_top_laterality_contacts.Visible = false;
-
- pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) + "other_icon.png");
- pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) +
"image_modes_other.png");
}
- image_button_show_modes_contacts_grid.Pixbuf = pixbufModeGrid;
- image_button_show_modes_encoder_grid.Pixbuf = pixbufModeGrid;
-
- if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
- image_encoder_exercise.Pixbuf = pixbufModeCurrent;
-
//show feedback icon
Pixbuf pixbufBellActive = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_active.png");
Pixbuf pixbufBellInactive = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_none.png");
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index f26e34dd6..d2b168083 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -475,9 +475,6 @@ public partial class ChronoJumpWindow
//assign here to have gui ok and not having chronojump logo at top right outside the screen
//all these will change when mode is selected
- 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_weight.png");
image_encoder_exercise.Pixbuf = pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
