[chronojump] CMJl added in menu
- From: Xavier de Blas <xaviblas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [chronojump] CMJl added in menu
- Date: Wed, 20 Jan 2010 15:58:53 +0000 (UTC)
commit 553b6740263d388c76bc0f663afb4b80bfc6a5a2
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jan 20 16:58:39 2010 +0100
CMJl added in menu
glade/chronojump.glade | 43 +++++++++++++++++++++++++++++++++++--------
src/gui/chronojump.cs | 13 +++++++------
2 files changed, 42 insertions(+), 14 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index f00d51a..e11a3a4 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6423,6 +6423,7 @@ suitable for agility tests)</property>
<widget class="GtkImageMenuItem" id="session_new">
<property name="label">gtk-new</property>
<property name="visible">True</property>
+ <property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="on_new_activate"/>
@@ -6612,6 +6613,7 @@ suitable for agility tests)</property>
<widget class="GtkImageMenuItem" id="menuitem_person_add_single">
<property name="label">gtk-new</property>
<property name="visible">True</property>
+ <property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_person_add_single_activate"/>
</widget>
@@ -6639,6 +6641,7 @@ suitable for agility tests)</property>
<widget class="GtkImageMenuItem" id="menuitem_recuperate_person">
<property name="label">gtk-open</property>
<property name="visible">True</property>
+ <property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_recuperate_person_activate"/>
</widget>
@@ -6766,6 +6769,15 @@ suitable for agility tests)</property>
</widget>
</child>
<child>
+ <widget class="GtkMenuItem" id="cmj_l">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">CounterMovement Jump with extra weight</property>
+ <property name="label" translatable="yes">CMJl</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_jump_extra_activate"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkMenuItem" id="abk">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Abalakov Jump (CounterMovement using arms)</property>
@@ -7418,6 +7430,7 @@ suitable for agility tests)</property>
<widget class="GtkImageMenuItem" id="menuitem_preferences">
<property name="label">gtk-preferences</property>
<property name="visible">True</property>
+ <property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_preferences_activate"/>
</widget>
@@ -7567,8 +7580,8 @@ suitable for agility tests)</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Edit selected person (E)</property>
<signal name="clicked" handler="on_edit_current_person_clicked"/>
- <accelerator key="e" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
<accelerator key="E" signal="clicked"/>
+ <accelerator key="e" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
<child>
<widget class="GtkImage" id="image1977">
<property name="visible">True</property>
@@ -7825,6 +7838,20 @@ suitable for agility tests)</property>
</packing>
</child>
<child>
+ <widget class="GtkButton" id="button_cmj_l">
+ <property name="label" translatable="yes">CMJl</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_jump_extra_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton" id="button_abk">
<property name="label">ABK</property>
<property name="visible">True</property>
@@ -7838,7 +7865,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -7855,7 +7882,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -7872,7 +7899,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -7889,7 +7916,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -7915,7 +7942,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -7935,7 +7962,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -7955,7 +7982,7 @@ suitable for agility tests)</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index f5e9368..034a012 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -104,6 +104,7 @@ public class ChronoJumpWindow
[Widget] Gtk.Button button_sj;
[Widget] Gtk.Button button_sj_l;
[Widget] Gtk.Button button_cmj;
+ [Widget] Gtk.Button button_cmj_l;
[Widget] Gtk.Button button_abk;
[Widget] Gtk.Button button_dj;
[Widget] Gtk.Button button_rocket;
@@ -170,6 +171,7 @@ public class ChronoJumpWindow
[Widget] Gtk.MenuItem sj;
[Widget] Gtk.MenuItem sj_l;
[Widget] Gtk.MenuItem cmj;
+ [Widget] Gtk.MenuItem cmj_l;
[Widget] Gtk.MenuItem abk;
[Widget] Gtk.MenuItem dj;
[Widget] Gtk.MenuItem menuitem_jump_rocket;
@@ -2627,9 +2629,8 @@ Console.WriteLine("X");
currentEventType = new JumpType("SJl");
} else if(o == (object) button_cmj) {
currentEventType = new JumpType("CMJ");
-//no cmj_l button currently
-// } else if(o == (object) button_cmj_l) {
-// currentEventType = new JumpType("CMJl");
+ } else if(o == (object) button_cmj_l) {
+ currentEventType = new JumpType("CMJl");
} else if(o == (object) button_abk) {
currentEventType = new JumpType("ABK");
//no abk_l button currently
@@ -2827,9 +2828,9 @@ Console.WriteLine("X");
currentJumpType = new JumpType("SJl");
} else if(o == (object) button_dj || o == (object) dj) {
currentJumpType = new JumpType("DJ");
-// currently no cmj_l, abk_l buttons or menu
-// } else if(o == (object) button_cmj_l || o == (object) cmj_l) {
-// currentJumpType = new JumpType("CMJl");
+ } else if(o == (object) button_cmj_l || o == (object) cmj_l) {
+ currentJumpType = new JumpType("CMJl");
+// currently no abk_l button or menu
// } else if(o == (object) button_abk_l || o == (object) abk_l) {
// currentJumpType = new JumpType("ABKl");
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
