[chronojump] All test mini-images converted 110x110 for new GUI
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] All test mini-images converted 110x110 for new GUI
- Date: Sat, 4 Jul 2015 20:07:52 +0000 (UTC)
commit a542aaa5d99be1d326809805ab88f1d1a4050866
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Jul 4 22:06:44 2015 +0200
All test mini-images converted 110x110 for new GUI
glade/chronojump.glade | 159 +++++++++++++++++++++++---------------
images/mini/agility_20yard.png | Bin 5513 -> 3695 bytes
images/mini/agility_3l3r.png | Bin 8678 -> 5894 bytes
images/mini/agility_505.png | Bin 7053 -> 5046 bytes
images/mini/agility_illinois.png | Bin 9376 -> 6734 bytes
images/mini/agility_shuttle.png | Bin 10817 -> 6988 bytes
images/mini/agility_t_test.png | Bin 6967 -> 5046 bytes
images/mini/agility_zigzag.png | Bin 7946 -> 5391 bytes
images/mini/gesell_dbt.png | Bin 7684 -> 5928 bytes
images/mini/jump_abk.png | Bin 5166 -> 4029 bytes
images/mini/jump_abk_l.png | Bin 5908 -> 4759 bytes
images/mini/jump_cmj.png | Bin 6169 -> 4703 bytes
images/mini/jump_cmj_l.png | Bin 6678 -> 5157 bytes
images/mini/jump_dj.png | Bin 6175 -> 4822 bytes
images/mini/jump_dj_a.png | Bin 5051 -> 3974 bytes
images/mini/jump_free.png | Bin 6307 -> 4857 bytes
images/mini/jump_max.png | Bin 4906 -> 3836 bytes
images/mini/jump_rj.png | Bin 6418 -> 4788 bytes
images/mini/jump_rj_hexagon.png | Bin 15807 -> 10626 bytes
images/mini/jump_rj_in.png | Bin 4531 -> 3429 bytes
images/mini/jump_rocket.png | Bin 3985 -> 3092 bytes
images/mini/jump_sj.png | Bin 4567 -> 3410 bytes
images/mini/jump_sj_l.png | Bin 5038 -> 3833 bytes
images/mini/margaria.png | Bin 2434 -> 2074 bytes
images/mini/mtgug.png | Bin 21744 -> 12648 bytes
images/mini/multiChronopic.png | Bin 2873 -> 3152 bytes
images/mini/no_image.png | Bin 229 -> 316 bytes
images/mini/pulse_custom.png | Bin 8279 -> 3999 bytes
images/mini/pulse_free.png | Bin 7224 -> 3465 bytes
images/mini/reaction_time.png | Bin 5013 -> 4174 bytes
images/mini/readme.txt | 2 +-
images/mini/run_analysis.png | Bin 3126 -> 2539 bytes
images/mini/run_interval.png | Bin 2834 -> 2155 bytes
images/mini/run_simple.png | Bin 2563 -> 1970 bytes
images/mini/take_off.png | Bin 4103 -> 3331 bytes
src/gui/chronojump.cs | 10 +--
36 files changed, 99 insertions(+), 72 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 6493357..eb35397 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3328,32 +3328,34 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox_image_test">
+ <widget class="GtkImage" id="image_test">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox_image_test">
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">14</property>
<child>
- <widget class="GtkLabel" id="label_image_test">
+ <widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="ellipsize">end</property>
- <property name="width_chars">15</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkAlignment" id="alignment106">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkButton"
id="button_image_test_zoom">
<property name="visible">True</property>
@@ -3367,55 +3369,13 @@
</widget>
</child>
</widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_test">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">14</property>
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
<widget class="GtkNotebook"
id="notebook_options_top">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4326,7 +4286,7 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <widget class="GtkHBox" id="hbox28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -4423,7 +4383,7 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox28">
+ <widget class="GtkHBox" id="hbox29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -4492,7 +4452,7 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox29">
+ <widget class="GtkHBox" id="hbox71">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -5490,7 +5450,7 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox71">
+ <widget class="GtkHBox" id="hbox185">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5564,6 +5524,13 @@ after time</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -7232,6 +7199,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8565,6 +8535,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -9539,6 +9512,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -21056,6 +21032,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -21929,6 +21908,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23294,6 +23276,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>
@@ -23716,6 +23701,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -34800,6 +34788,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>
@@ -36255,6 +36261,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>
@@ -37592,6 +37610,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>
@@ -38503,6 +38524,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>
@@ -41872,6 +41896,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>
@@ -42409,6 +42436,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42961,6 +42991,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/mini/agility_20yard.png b/images/mini/agility_20yard.png
index defa46c..bd1c18a 100644
Binary files a/images/mini/agility_20yard.png and b/images/mini/agility_20yard.png differ
diff --git a/images/mini/agility_3l3r.png b/images/mini/agility_3l3r.png
index a655b1a..5514b9c 100644
Binary files a/images/mini/agility_3l3r.png and b/images/mini/agility_3l3r.png differ
diff --git a/images/mini/agility_505.png b/images/mini/agility_505.png
index 6d4c344..9874016 100644
Binary files a/images/mini/agility_505.png and b/images/mini/agility_505.png differ
diff --git a/images/mini/agility_illinois.png b/images/mini/agility_illinois.png
index 0257024..445080f 100644
Binary files a/images/mini/agility_illinois.png and b/images/mini/agility_illinois.png differ
diff --git a/images/mini/agility_shuttle.png b/images/mini/agility_shuttle.png
index 12172bc..6fa9301 100644
Binary files a/images/mini/agility_shuttle.png and b/images/mini/agility_shuttle.png differ
diff --git a/images/mini/agility_t_test.png b/images/mini/agility_t_test.png
index c0fcfd6..8a17b29 100644
Binary files a/images/mini/agility_t_test.png and b/images/mini/agility_t_test.png differ
diff --git a/images/mini/agility_zigzag.png b/images/mini/agility_zigzag.png
index 58babde..ddc6811 100644
Binary files a/images/mini/agility_zigzag.png and b/images/mini/agility_zigzag.png differ
diff --git a/images/mini/gesell_dbt.png b/images/mini/gesell_dbt.png
index f29d1fc..a84b8b4 100644
Binary files a/images/mini/gesell_dbt.png and b/images/mini/gesell_dbt.png differ
diff --git a/images/mini/jump_abk.png b/images/mini/jump_abk.png
index 5a91602..0ee7005 100644
Binary files a/images/mini/jump_abk.png and b/images/mini/jump_abk.png differ
diff --git a/images/mini/jump_abk_l.png b/images/mini/jump_abk_l.png
index a5e3cc9..b163376 100644
Binary files a/images/mini/jump_abk_l.png and b/images/mini/jump_abk_l.png differ
diff --git a/images/mini/jump_cmj.png b/images/mini/jump_cmj.png
index 4b59161..54f8fc6 100644
Binary files a/images/mini/jump_cmj.png and b/images/mini/jump_cmj.png differ
diff --git a/images/mini/jump_cmj_l.png b/images/mini/jump_cmj_l.png
index 91a4f71..f42d32d 100644
Binary files a/images/mini/jump_cmj_l.png and b/images/mini/jump_cmj_l.png differ
diff --git a/images/mini/jump_dj.png b/images/mini/jump_dj.png
index 8b260cb..13b084a 100644
Binary files a/images/mini/jump_dj.png and b/images/mini/jump_dj.png differ
diff --git a/images/mini/jump_dj_a.png b/images/mini/jump_dj_a.png
index 9d7eefb..3aee75e 100644
Binary files a/images/mini/jump_dj_a.png and b/images/mini/jump_dj_a.png differ
diff --git a/images/mini/jump_free.png b/images/mini/jump_free.png
index d028026..d9a4d47 100644
Binary files a/images/mini/jump_free.png and b/images/mini/jump_free.png differ
diff --git a/images/mini/jump_max.png b/images/mini/jump_max.png
index 0a1f2d4..9dbf006 100644
Binary files a/images/mini/jump_max.png and b/images/mini/jump_max.png differ
diff --git a/images/mini/jump_rj.png b/images/mini/jump_rj.png
index a650f35..2dd5f7c 100644
Binary files a/images/mini/jump_rj.png and b/images/mini/jump_rj.png differ
diff --git a/images/mini/jump_rj_hexagon.png b/images/mini/jump_rj_hexagon.png
index 6c1dc43..ab45c55 100644
Binary files a/images/mini/jump_rj_hexagon.png and b/images/mini/jump_rj_hexagon.png differ
diff --git a/images/mini/jump_rj_in.png b/images/mini/jump_rj_in.png
index 14178b5..dac54ae 100644
Binary files a/images/mini/jump_rj_in.png and b/images/mini/jump_rj_in.png differ
diff --git a/images/mini/jump_rocket.png b/images/mini/jump_rocket.png
index 564e457..4753819 100644
Binary files a/images/mini/jump_rocket.png and b/images/mini/jump_rocket.png differ
diff --git a/images/mini/jump_sj.png b/images/mini/jump_sj.png
index 571dd2f..78c24a6 100644
Binary files a/images/mini/jump_sj.png and b/images/mini/jump_sj.png differ
diff --git a/images/mini/jump_sj_l.png b/images/mini/jump_sj_l.png
index b33aeec..4fa28f2 100644
Binary files a/images/mini/jump_sj_l.png and b/images/mini/jump_sj_l.png differ
diff --git a/images/mini/margaria.png b/images/mini/margaria.png
index 9d4e574..06d375f 100644
Binary files a/images/mini/margaria.png and b/images/mini/margaria.png differ
diff --git a/images/mini/mtgug.png b/images/mini/mtgug.png
index 354514e..cc7a886 100644
Binary files a/images/mini/mtgug.png and b/images/mini/mtgug.png differ
diff --git a/images/mini/multiChronopic.png b/images/mini/multiChronopic.png
index 64794cc..fc35f3c 100644
Binary files a/images/mini/multiChronopic.png and b/images/mini/multiChronopic.png differ
diff --git a/images/mini/no_image.png b/images/mini/no_image.png
index ba5ccd4..97e4f39 100644
Binary files a/images/mini/no_image.png and b/images/mini/no_image.png differ
diff --git a/images/mini/pulse_custom.png b/images/mini/pulse_custom.png
index 0bc301f..698d494 100644
Binary files a/images/mini/pulse_custom.png and b/images/mini/pulse_custom.png differ
diff --git a/images/mini/pulse_free.png b/images/mini/pulse_free.png
index 94fc451..1b3bbda 100644
Binary files a/images/mini/pulse_free.png and b/images/mini/pulse_free.png differ
diff --git a/images/mini/reaction_time.png b/images/mini/reaction_time.png
index 04e65be..808affe 100644
Binary files a/images/mini/reaction_time.png and b/images/mini/reaction_time.png differ
diff --git a/images/mini/readme.txt b/images/mini/readme.txt
index 8bab06d..619c0f9 100644
--- a/images/mini/readme.txt
+++ b/images/mini/readme.txt
@@ -1,3 +1,3 @@
-Images here should have the same name as parent dir, and should have 150px wide
+Images here should have the same name as parent dir, and should have 110x110 since chronojump 1.5.2
no_image.png is a special image that should not be in parent directory
diff --git a/images/mini/run_analysis.png b/images/mini/run_analysis.png
index da443f6..f6ca6c2 100644
Binary files a/images/mini/run_analysis.png and b/images/mini/run_analysis.png differ
diff --git a/images/mini/run_interval.png b/images/mini/run_interval.png
index f97d4b7..d2bd2f5 100644
Binary files a/images/mini/run_interval.png and b/images/mini/run_interval.png differ
diff --git a/images/mini/run_simple.png b/images/mini/run_simple.png
index cbf2fe9..7798bb2 100644
Binary files a/images/mini/run_simple.png and b/images/mini/run_simple.png differ
diff --git a/images/mini/take_off.png b/images/mini/take_off.png
index 96cbf0c..8e706ed 100644
Binary files a/images/mini/take_off.png and b/images/mini/take_off.png differ
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index ccf79d5..46f03c3 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -296,12 +296,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Frame frame_share_data;
[Widget] Gtk.EventBox eventbox_image_test;
- [Widget] Gtk.Box vbox_image_test;
- [Widget] Gtk.Box hbox_image_test;
[Widget] Gtk.Image image_test;
[Widget] Gtk.Button button_image_test_zoom;
[Widget] Gtk.Image image_test_zoom;
- [Widget] Gtk.Label label_image_test;
[Widget] Gtk.Box vbox_this_test_buttons;
[Widget] Gtk.Button button_video_play_this_test;
[Widget] Gtk.Button button_delete_this_test;
@@ -3768,9 +3765,6 @@ public partial class ChronoJumpWindow
//changes the image about the text on the bottom left of main screen
private void changeTestImage(string eventTypeString, string eventName, string fileNameString) {
- label_image_test.Text = "<b>" + eventName + "</b>";
- label_image_test.UseMarkup = true;
-
Pixbuf pixbuf; //main image
Pixbuf pixbufZoom; //icon of zoom image (if shown can have two different images)
@@ -6275,7 +6269,7 @@ LogB.Debug("X");
menuSessionSensitive(false);
menuPersonSelectedSensitive(false);
- vbox_image_test.Sensitive = false;
+ button_image_test_zoom.Sensitive = false;
frame_persons.Sensitive = false;
button_recuperate_person.Sensitive = false;
button_recuperate_persons_from_session.Sensitive = false;
@@ -6305,7 +6299,7 @@ LogB.Debug("X");
}
private void sensitiveGuiYesSession () {
- vbox_image_test.Sensitive = true;
+ button_image_test_zoom.Sensitive = true;
frame_persons.Sensitive = true;
button_recuperate_person.Sensitive = true;
button_recuperate_persons_from_session.Sensitive = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
