[chronojump] Chronojump start 6 modes. Done!
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Chronojump start 6 modes. Done!
- Date: Sun, 16 Apr 2017 11:30:35 +0000 (UTC)
commit 70d0487f79a747d85d31ef472b035fd4f5e0c39a
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Apr 16 13:29:37 2017 +0200
Chronojump start 6 modes. Done!
glade/app1.glade | 34 ++++++++++++++++++-
.../md/ic_directions_run_multiple_blue_24dp_1x.png | Bin 0 -> 566 bytes
.../md/ic_directions_run_simple_blue_24dp_1x.png | Bin 0 -> 555 bytes
images/md/ic_jump_reactive_blue_24dp_1x.png | Bin 0 -> 538 bytes
images/md/ic_jump_simple_blue_24dp_1x.png | Bin 0 -> 517 bytes
images/md/jump.xcf | Bin 0 -> 2858 bytes
src/Makefile.am | 4 ++
src/constants.cs | 4 --
src/gui/chronojumpIcons.cs | 10 +++--
9 files changed, 42 insertions(+), 10 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 35a59cf..759885c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1035,7 +1035,7 @@
<widget class="GtkVBox" id="vbox80">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">30</property>
<child>
<widget class="GtkNotebook" id="notebook_start_selector2">
<property name="visible">True</property>
@@ -1582,11 +1582,41 @@
<property name="layout_style">center</property>
<child>
<widget class="GtkButton" id="button_start_cancel">
- <property name="label"
translatable="yes">Back</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_start_cancel_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_selector_start_cancel">
+ <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"
translatable="yes">Cancel</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="expand">False</property>
diff --git a/images/md/ic_directions_run_multiple_blue_24dp_1x.png
b/images/md/ic_directions_run_multiple_blue_24dp_1x.png
new file mode 100644
index 0000000..fe2cc30
Binary files /dev/null and b/images/md/ic_directions_run_multiple_blue_24dp_1x.png differ
diff --git a/images/md/ic_directions_run_simple_blue_24dp_1x.png
b/images/md/ic_directions_run_simple_blue_24dp_1x.png
new file mode 100644
index 0000000..3ce5ecd
Binary files /dev/null and b/images/md/ic_directions_run_simple_blue_24dp_1x.png differ
diff --git a/images/md/ic_jump_reactive_blue_24dp_1x.png b/images/md/ic_jump_reactive_blue_24dp_1x.png
new file mode 100644
index 0000000..8c8c507
Binary files /dev/null and b/images/md/ic_jump_reactive_blue_24dp_1x.png differ
diff --git a/images/md/ic_jump_simple_blue_24dp_1x.png b/images/md/ic_jump_simple_blue_24dp_1x.png
new file mode 100644
index 0000000..2707f11
Binary files /dev/null and b/images/md/ic_jump_simple_blue_24dp_1x.png differ
diff --git a/images/md/jump.xcf b/images/md/jump.xcf
new file mode 100644
index 0000000..881d899
Binary files /dev/null and b/images/md/jump.xcf differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 632f7ca..b3d8629 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -391,7 +391,11 @@ RESOURCES = \
../images/md/ic_looks_one_blue_24dp_1x.png,one.png \
../images/md/ic_add_circle_blue_24dp_1x.png,image_add_test.png \
../images/md/ic_all_inclusive_blue_24dp_1x.png,cont.png \
+ ../images/md/ic_jump_simple_blue_24dp_1x.png,image_jump_simple.png \
+ ../images/md/ic_jump_reactive_blue_24dp_1x.png,image_jump_reactive.png \
../images/md/ic_directions_run_blue_24dp_2x.png,run.png \
+ ../images/md/ic_directions_run_simple_blue_24dp_1x.png,image_run_simple.png \
+ ../images/md/ic_directions_run_multiple_blue_24dp_1x.png,image_run_multiple.png \
../images/md/ic_build_blue_24dp_1x.png,image_build.png \
../images/md/ic_edit_blue_24dp_1x.png,image_edit.png \
../images/md/ic_add_blue_24dp_1x.png,image_add.png \
diff --git a/src/constants.cs b/src/constants.cs
index aad4ff6..89f2e58 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -422,10 +422,6 @@ public class Constants
public static string FileNameCSVName1Icon = "import-csv-name-1-column.png";
public static string FileNameCSVName2Icon = "import-csv-name-2-columns.png";
- public static string FileNameJumps = "stock_up.png";
- public static string FileNameJumpsRJ = "stock_up_down.png";
- public static string FileNameRuns = "stock_right.png";
- public static string FileNameRunsInterval = "stock_right_left.png";
public static string FileNameEncoderGravitatory = "stock_down.png";
public static string FileNameEncoderInertial = "stock_inertial.png";
public static string FileNamePulse = "pulse_menu.png";
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index c9b6161..35e9cc3 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -61,6 +61,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_selector_start_force_sensor;
[Widget] Gtk.Image image_selector_start_rt;
[Widget] Gtk.Image image_selector_start_other;
+ [Widget] Gtk.Image image_selector_start_cancel;
//encoder images
[Widget] Gtk.Image image_recalculate;
@@ -127,6 +128,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_cancel.png");
image_button_cancel.Pixbuf = pixbuf;
image_encoder_capture_cancel.Pixbuf = pixbuf;
+ image_selector_start_cancel.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_pin.png");
image_manage_persons.Pixbuf = pixbuf;
@@ -240,13 +242,13 @@ public partial class ChronoJumpWindow
* gui for small screens
*/
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumps);
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_jump_simple.png");
image_mode_jumps_small.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsRJ);
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_jump_reactive.png");
image_mode_jumps_reactive_small.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRuns);
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_run_simple.png");
image_mode_runs_small.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_run_multiple.png");
image_mode_runs_intervallic_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
