[chronojump/michrolab] Small icons for isometric/elastic on top
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/michrolab] Small icons for isometric/elastic on top
- Date: Thu, 6 Oct 2022 10:53:10 +0000 (UTC)
commit 61f69ffe96477f0d3463e3ec8ee3c199e7eb6c18
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Oct 3 11:46:15 2022 +0200
Small icons for isometric/elastic on top
glade/app1.glade | 84 +++++++++++----------------------------
images/md/elastic_2x.png | Bin 0 -> 2173 bytes
images/md/isometric_2x.png | Bin 0 -> 1282 bytes
images/svg/force_sensor_icon.svg | 26 ++++++------
src/Makefile.am | 2 +
src/constants.cs | 4 +-
src/gui/app1/icons.cs | 8 ++--
7 files changed, 45 insertions(+), 79 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 9e71d96b9..f8cdeae64 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -4339,35 +4339,11 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox105">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
<widget class="GtkImage"
id="image_change_modes_contacts_force_sensor">
<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>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">I</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
</child>
</widget>
</child>
@@ -4393,35 +4369,11 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox82">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
<widget class="GtkImage"
id="image_change_modes_contacts_force_sensor1">
<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>
- <child>
- <widget class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">E</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
</child>
</widget>
</child>
@@ -21826,6 +21778,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27157,6 +27112,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -33956,18 +33914,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>
@@ -34004,6 +33950,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>
@@ -43481,6 +43439,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -51655,6 +51616,9 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/md/elastic_2x.png b/images/md/elastic_2x.png
new file mode 100644
index 000000000..5a5ffbc1d
Binary files /dev/null and b/images/md/elastic_2x.png differ
diff --git a/images/md/isometric_2x.png b/images/md/isometric_2x.png
new file mode 100644
index 000000000..a52814ad9
Binary files /dev/null and b/images/md/isometric_2x.png differ
diff --git a/images/svg/force_sensor_icon.svg b/images/svg/force_sensor_icon.svg
index c8df093cc..ab15738fa 100644
--- a/images/svg/force_sensor_icon.svg
+++ b/images/svg/force_sensor_icon.svg
@@ -272,8 +272,8 @@
x="-11.350949"
y="324.19778"
inkscape:export-filename="../md/isometric.png"
- inkscape:export-xdpi="177.33446"
- inkscape:export-ydpi="177.33446" />
+ inkscape:export-xdpi="88.667221"
+ inkscape:export-ydpi="88.667221" />
<path
style="fill:#687db1;fill-opacity:1;stroke:none;stroke-width:0.3163px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -11.120679,330.68821 h 6.4798428 v -5.54581 l -4.3142108,-0.009 -0.733246,0.43979
-0.2387296,0.65155 -0.4808614,3.94294 z"
@@ -303,24 +303,24 @@
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:2.11667px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
- x="-25.310366"
- y="322.81998"
+ x="-27.079056"
+ y="322.77884"
id="text8356"><tspan
sodipodi:role="line"
style="font-size:2.11667px;stroke-width:0.264583"
- x="-25.310366"
- y="322.81998"
- id="tspan13526">isometric2.png 48x48</tspan></text>
+ x="-27.079056"
+ y="322.77884"
+ id="tspan13526">isometric_2x.png 48x48</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:2.11667px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
- x="-25.16526"
- y="319.85446"
+ x="-26.93395"
+ y="319.81332"
id="text8356-7"><tspan
sodipodi:role="line"
style="font-size:2.11667px;stroke-width:0.264583"
- x="-25.16526"
- y="319.85446"
+ x="-26.93395"
+ y="319.81332"
id="tspan13526-9">isometric.png 24x24</tspan></text>
<text
xml:space="preserve"
@@ -332,7 +332,7 @@
style="font-size:2.11667px;stroke-width:0.264583"
x="-0.9129324"
y="322.64529"
- id="tspan13526-0">elastic2.png 48x48</tspan></text>
+ id="tspan13526-0">elastic2_x.png 48x48</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:2.11667px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
@@ -398,7 +398,7 @@
height="6.875"
x="-2.1316001"
y="324.19778"
- inkscape:export-filename="../md/elastic.png"
+ inkscape:export-filename="../md/elastic_2x.png"
inkscape:export-xdpi="177.33446"
inkscape:export-ydpi="177.33446" />
<path
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b994cba7..aa831fc53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -618,6 +618,8 @@ RESOURCES = \
../images/force_sensor_icon_yellow.png,force_sensor_icon_yellow.png \
../images/md/isometric.png,isometric.png \
../images/md/elastic.png,elastic.png \
+ ../images/md/isometric_2x.png,isometric_2x.png \
+ ../images/md/elastic_2x.png,elastic_2x.png \
../images/reaction_time_icon.png,reaction_time_icon.png \
../images/other_icon.png,other_icon.png \
../images/other_icon_yellow.png,other_icon_yellow.png \
diff --git a/src/constants.cs b/src/constants.cs
index 581c05e71..c89546080 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -1112,9 +1112,9 @@ public class Constants
else if (mode == Constants.Modes.POWERINERTIAL)
return "image_inertia.png";
else if (mode == Constants.Modes.FORCESENSORISOMETRIC)
- return "force_sensor_icon.png"; //TODO: change this
+ return "isometric.png";
else if (mode == Constants.Modes.FORCESENSORELASTIC)
- return "force_sensor_icon.png"; //TODO: change this
+ return "elastic.png";
else
return "image_jump_simple"; //to not crash if there is any future mode
}
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 22e300c8b..d60151df7 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -643,9 +643,9 @@ public partial class ChronoJumpWindow
image_selector_start_jumps1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "run_mov_2x.png");
image_selector_start_runs1.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "isometric.png");
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "isometric_2x.png");
image_selector_start_isometric.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "elastic.png");
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "elastic_2x.png");
image_selector_start_elastic.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_weight_mov_2x.png");
image_selector_start_displ_weights.Pixbuf = pixbuf;
@@ -671,8 +671,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_run_multiple.png");
image_mode_runs_intervallic_small2.Pixbuf = pixbuf;
image_change_modes_contacts_runs_intervallic.Pixbuf = pixbuf;
- image_change_modes_contacts_force_sensor.Pixbuf = new Pixbuf (null, Util.GetImagePath(false)
+ "force_sensor_icon.png");
- image_change_modes_contacts_force_sensor1.Pixbuf = new Pixbuf (null, Util.GetImagePath(false)
+ "force_sensor_icon.png");
+ image_change_modes_contacts_force_sensor.Pixbuf = new Pixbuf (null, Util.GetImagePath(false)
+ "isometric.png");
+ image_change_modes_contacts_force_sensor1.Pixbuf = new Pixbuf (null, Util.GetImagePath(false)
+ "elastic.png");
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "race_encoder_icon.png");
image_mode_race_encoder_small1.Pixbuf = pixbuf;
image_change_modes_contacts_runs_encoder.Pixbuf = pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
