commit 1b78c141d736dda6827b22ab48e75f2c30bd0ad1
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 17 16:47:12 2017 +0200
Added person up/down buttons again
glade/app1.glade | 149 ++++++++++++++++++++++++++++----------------
src/gui/chronojumpIcons.cs | 8 ++-
2 files changed, 99 insertions(+), 58 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 192b11b..70b3544 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1245,6 +1245,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2413,142 +2416,175 @@ EncoderInertialCapture</property>
<widget class="GtkVBox" id="vbox_persons_bottom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox_persons_bottom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_persons_up">
+ <widget class="GtkVBox" id="vbox75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox91">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_edit_current_person">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Select previous person
-<Control>Up</property>
+ <property name="tooltip" translatable="yes">Edit
selected person
+<Control>p</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_treeview_persons_up" swapped="no"/>
- <accelerator key="Up" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
+ <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkImage" id="image_persons_up">
+ <widget class="GtkImage"
id="image_edit_current_person">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_persons_down">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_show_all_person_events">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Select next person
-<Control>Down</property>
+ <property name="tooltip" translatable="yes">Show
all tests of this person</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_treeview_persons_down" swapped="no"/>
- <accelerator key="Down" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <signal name="clicked"
handler="on_show_all_person_events_activate" swapped="no"/>
<child>
- <widget class="GtkImage" id="image_persons_down">
+ <widget class="GtkImage"
id="image_all_persons_events">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_edit_current_person">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_delete_current_person">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
selected person
-<Control>p</property>
+ <property name="tooltip"
translatable="yes">Delete person</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
- <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <signal name="clicked"
handler="on_delete_current_person_from_session_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_edit_current_person">
+ <widget class="GtkImage"
id="image_person_delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_show_all_person_events">
+ <widget class="GtkVBox" id="vbox78">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_persons_up">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Show
all tests of this person</property>
+ <property name="tooltip"
translatable="yes">Select previous person
+<Control>Up</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_show_all_person_events_activate" swapped="no"/>
+ <signal name="clicked"
handler="on_treeview_persons_up" swapped="no"/>
+ <accelerator key="Up" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkImage"
id="image_all_persons_events">
+ <widget class="GtkArrow" id="arrow_up">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
+ <property name="arrow_type">up</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_delete_current_person">
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_persons_down">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Delete person</property>
+ <property name="tooltip"
translatable="yes">Select next person
+<Control>Down</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_delete_current_person_from_session_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_treeview_persons_down" swapped="no"/>
+ <accelerator key="Down" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkImage"
id="image_person_delete">
+ <widget class="GtkArrow" id="arrow_down">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-size">2</property>
+ <property name="arrow_type">down</property>
</widget>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -2556,7 +2592,7 @@ EncoderInertialCapture</property>
<widget class="GtkHBox" id="hbox_rest_time">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">5</property>
<child>
<widget class="GtkCheckButton"
id="checkbutton_rest">
<property name="visible">True</property>
@@ -20276,6 +20312,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index f9c4452..393d4d1 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -39,8 +39,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_manage_persons;
[Widget] Gtk.Image image_person;
[Widget] Gtk.Image image_edit_current_person;
- [Widget] Gtk.Image image_persons_up;
- [Widget] Gtk.Image image_persons_down;
+ //[Widget] Gtk.Image image_persons_up;
+ //[Widget] Gtk.Image image_persons_down;
[Widget] Gtk.Image image_rest;
[Widget] Gtk.Image image_all_persons_events;
[Widget] Gtk.Image image_chronopic_connect_contacts;
@@ -194,11 +194,13 @@ public partial class ChronoJumpWindow
image_edit_current_person.Pixbuf = pixbuf;
//pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
//image_encoder_exercise_close.Pixbuf = pixbuf;
-
+
+ /*
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_up.png");
image_persons_up.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_down.png");
image_persons_down.Pixbuf = pixbuf;
+ */
//persons buttons
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_add.png");