[chronojump] Added inertial image and improved start page



commit c812cce8bd33ee977d260a897942b5c2aa61b450
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri May 27 08:58:28 2016 +0200

    Added inertial image and improved start page

 glade/chronojump.glade              |   68 ++++++++++++++++++++++++++++++++---
 images/chronojump-encoder-small.jpg |  Bin 54676 -> 49375 bytes
 images/chronojump-inertial.png      |  Bin 0 -> 48002 bytes
 images/chronojump-jumps-small.png   |  Bin 18425 -> 16156 bytes
 images/chronojump-runs-small.png    |  Bin 126566 -> 33928 bytes
 src/Makefile.am                     |    1 +
 src/constants.cs                    |    3 +-
 src/gui/chronojump.cs               |    9 +++--
 8 files changed, 72 insertions(+), 9 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 4cd32fe..f098819 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -587,6 +587,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="tooltip" translatable="yes">Or press '1'</property>
+                                <property name="relief">none</property>
                                 <signal name="clicked" handler="on_button_selector_start_jumps_clicked" 
swapped="no"/>
                                 <accelerator key="1" signal="clicked"/>
                                 <child>
@@ -707,6 +708,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="tooltip" translatable="yes">Or press '2'</property>
+                                <property name="relief">none</property>
                                 <signal name="clicked" handler="on_button_selector_start_runs_clicked" 
swapped="no"/>
                                 <accelerator key="2" signal="clicked"/>
                                 <child>
@@ -827,6 +829,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="tooltip" translatable="yes">Or press '3'</property>
+                                <property name="relief">none</property>
                                 <signal name="clicked" 
handler="on_button_selector_start_power_gravitatory_clicked" swapped="no"/>
                                 <accelerator key="3" signal="clicked"/>
                                 <child>
@@ -848,7 +851,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkImage" id="image_selector_start_encoder">
+                                      <widget class="GtkImage" id="image_selector_start_encoder_gravitatory">
                                         <property name="width_request">225</property>
                                         <property name="height_request">261</property>
                                         <property name="visible">True</property>
@@ -936,6 +939,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="tooltip" translatable="yes">Or press '4'</property>
+                                <property name="relief">none</property>
                                 <signal name="clicked" 
handler="on_button_selector_start_power_inertial_clicked" swapped="no"/>
                                 <accelerator key="4" signal="clicked"/>
                                 <child>
@@ -957,7 +961,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkImage" id="image_selector_start_encoder1">
+                                      <widget class="GtkImage" id="image_selector_start_encoder_inertial">
                                         <property name="width_request">225</property>
                                         <property name="height_request">261</property>
                                         <property name="visible">True</property>
@@ -16541,6 +16545,9 @@ on current Chronojump version.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -21218,6 +21225,9 @@ by you</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -22376,6 +22386,9 @@ by you</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -24026,6 +24039,9 @@ by you</property>
               <placeholder/>
             </child>
             <child>
+              <placeholder/>
+            </child>
+            <child>
               <widget class="GtkButton" id="button_video_url">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -24733,6 +24749,9 @@ by you</property>
             <child>
               <placeholder/>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </widget>
           <packing>
             <property name="expand">True</property>
@@ -37648,6 +37667,24 @@ options</property>
                             <child>
                               <placeholder/>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -40243,6 +40280,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -41510,9 +41559,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                                       <placeholder/>
                                     </child>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
                                       <widget class="GtkLabel" id="label218">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -42670,6 +42716,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                                     <child>
                                       <placeholder/>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </widget>
                                 </child>
                               </widget>
@@ -46714,6 +46763,9 @@ It starts before and arrives there with some speed.</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
@@ -47536,6 +47588,9 @@ It starts before and arrives there with some speed.</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -48373,6 +48428,9 @@ It starts before and arrives there with some speed.</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
diff --git a/images/chronojump-encoder-small.jpg b/images/chronojump-encoder-small.jpg
index 0d04cba..d3cd17d 100644
Binary files a/images/chronojump-encoder-small.jpg and b/images/chronojump-encoder-small.jpg differ
diff --git a/images/chronojump-inertial.png b/images/chronojump-inertial.png
new file mode 100644
index 0000000..599b12d
Binary files /dev/null and b/images/chronojump-inertial.png differ
diff --git a/images/chronojump-jumps-small.png b/images/chronojump-jumps-small.png
index 9f2e297..527ac00 100644
Binary files a/images/chronojump-jumps-small.png and b/images/chronojump-jumps-small.png differ
diff --git a/images/chronojump-runs-small.png b/images/chronojump-runs-small.png
index 3071529..0e292ab 100644
Binary files a/images/chronojump-runs-small.png and b/images/chronojump-runs-small.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d70088..5c70989 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,6 +181,7 @@ RESOURCES = \
        ../images/chronojump-jumps-small.png,chronojump-jumps-small.png \
        ../images/chronojump-runs-small.png,chronojump-runs-small.png \
        ../images/chronojump-encoder-small.jpg,chronojump-encoder-small.jpg \
+       ../images/chronojump-inertial.png,chronojump-inertial.png \
        ../images/agility_505.png,agility_505.png\
        ../images/mini/agility_505.png,mini/agility_505.png \
        ../images/agility_20yard.png,agility_20yard.png\
diff --git a/src/constants.cs b/src/constants.cs
index 92ebc42..123bdd2 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -439,7 +439,8 @@ public class Constants
        
        public static string FileNameSelectorJumps = "chronojump-jumps-small.png";
        public static string FileNameSelectorRuns = "chronojump-runs-small.png";
-       public static string FileNameSelectorEncoder = "chronojump-encoder-small.jpg";
+       public static string FileNameSelectorEncoderGravitatory = "chronojump-encoder-small.jpg";
+       public static string FileNameSelectorEncoderInertial = "chronojump-inertial.png";
 
        public static string FileNameLog = "log_chronojump.txt";
        public static string FileNameLogOld = "log_chronojump_old.txt";
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 7045f69..1cc0c2b 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -61,7 +61,8 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Image image_logo;
        [Widget] Gtk.Image image_selector_start_jumps;
        [Widget] Gtk.Image image_selector_start_runs;
-       [Widget] Gtk.Image image_selector_start_encoder;
+       [Widget] Gtk.Image image_selector_start_encoder_gravitatory;
+       [Widget] Gtk.Image image_selector_start_encoder_inertial;
        
        //gui for small screens
        [Widget] Gtk.RadioButton radio_mode_jumps_small;
@@ -861,8 +862,10 @@ public partial class ChronoJumpWindow
                image_selector_start_jumps.Pixbuf = pixbuf;
                pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameSelectorRuns);
                image_selector_start_runs.Pixbuf = pixbuf;
-               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameSelectorEncoder);
-               image_selector_start_encoder.Pixbuf = pixbuf;
+               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + 
Constants.FileNameSelectorEncoderGravitatory);
+               image_selector_start_encoder_gravitatory.Pixbuf = pixbuf;
+               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + 
Constants.FileNameSelectorEncoderInertial);
+               image_selector_start_encoder_inertial.Pixbuf = pixbuf;
 
                pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogo);
                image_logo.Pixbuf = pixbuf;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]